From 76fa93a241dfb0e6aebc80f9079e8dc2c02cf0eb Mon Sep 17 00:00:00 2001 From: Pennek Date: Sun, 5 Jul 2020 20:23:23 +0200 Subject: [PATCH 01/14] modify hitsound --- wiki/Beatmapping/Hitsound/en.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wiki/Beatmapping/Hitsound/en.md b/wiki/Beatmapping/Hitsound/en.md index 842f5ad6d016..358b890fb58b 100644 --- a/wiki/Beatmapping/Hitsound/en.md +++ b/wiki/Beatmapping/Hitsound/en.md @@ -6,16 +6,18 @@ tags: # Hitsound -*See also: [How to add custom hitsounds](/wiki/Guides/Adding_Custom_Hitsounds)* +*See also: [Adding custom hitsounds](/wiki/Guides/Adding_Custom_Hitsounds)* -A **hitsound** is a sound effect played when a [hit object](/wiki/Hit_Objects) is clicked. Hitsound feedback consists of a default sample called a "hit normal", and any combination of whistle, finish, or clap sample additions. Each sample has one of three "sample sets" that change its style: `Normal`, `Soft`, or `Drum`. +**Hitsounds** are the sounds that osu! plays in response to user input when interacting with [hit objects](/wiki/Hit_Objects) in a [game mode](/wiki/Game_Modes/). Hitsounds are used to give auditory feedback to the player to help them judge their [accuracy](/wiki/Accuracy/) in relation to the song. -[Spinners](/wiki/Hit_Objects/Spinner) and [sliders](/wiki/Hit_Objects/Slider) have additional spinner spin, spinner bonus, slider slide, and slider tick hitsounds. +Hitsound feedback consists of a default sample called a "hit normal", and any combination of whistle, finish, or clap sample additions. Each sample has one of three "sample sets" that change its style: `Normal`, `Soft`, or `Drum`. Beatmappers can replace any default sound samples with custom samples using a [beatmapset](/wiki/Beatmaps/Beatmapsets)'s folder. A player's [skin](/wiki/Skinning) can also replace default hitsounds on all beatmaps. Details on hitsound samples can be found in the [hitsound skinning](/wiki/Skinning/Sounds#hitsounds) article. +[Spinners](/wiki/Hit_Objects/Spinner) and [sliders](/wiki/Hit_Objects/Slider) have additional spinner spin, spinner bonus, slider slide, and slider tick hitsounds. + ## Active hitsound An active hitsound correlates to a player's clicking by reaching its peak impact immediately when played. Drum sound samples are the most frequently used active hitsounds because they provide clear and immediate feedback. @@ -28,7 +30,7 @@ Hitsounds can be added through storyboarding, but because they don't correlate t ## Keysound -A keysound is a hitsound sample that is extremely similar or directly taken from the song and is used to replicate the pitch of the song's notes. This method of hitsounding usually provides low feedback to the player, but can be interesting and make sections of maps stand out when applied well. +A keysound is a hitsound sample that is extremely similar or directly taken from the song and is used to replicate the pitch of the song's notes. This method of hitsounding usually provides low feedback to the player, but can be interesting and make sections of a map stand out when applied well. ## In osu!taiko From 52ef10f5d9433689eefa5370ed5041b0cd283b6d Mon Sep 17 00:00:00 2001 From: Pennek Date: Sun, 5 Jul 2020 21:10:35 +0200 Subject: [PATCH 02/14] i-j --- wiki/Glossary/Ignore_List/en.md | 12 ++++++++++++ wiki/Glossary/Juice_Stream/en.md | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 wiki/Glossary/Ignore_List/en.md create mode 100644 wiki/Glossary/Juice_Stream/en.md diff --git a/wiki/Glossary/Ignore_List/en.md b/wiki/Glossary/Ignore_List/en.md new file mode 100644 index 000000000000..8e1df88d1e82 --- /dev/null +++ b/wiki/Glossary/Ignore_List/en.md @@ -0,0 +1,12 @@ +--- +tags: + - blacklist +--- + +# Ignore List + +The **ignore list** is a blacklist of words (or users) that the player does not want to be displayed in the [chat console](/wiki/chat_console). It can be accessed and modified in the [user settings menu](https://osu.ppy.sh/home/account/edit) under the privacy tab. + + + + diff --git a/wiki/Glossary/Juice_Stream/en.md b/wiki/Glossary/Juice_Stream/en.md new file mode 100644 index 000000000000..fc8b92eac180 --- /dev/null +++ b/wiki/Glossary/Juice_Stream/en.md @@ -0,0 +1,11 @@ +# Juice Stream + +**Juice streams** are an element element in [osu!catch](/wiki/Game_Modes/osu!catch/) which includes both Drops and Droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!/), while Droplets give a score of 10, equivalent to the [slider tick](#slider-tick) in osu!standard. + +Missing a Drop breaks the player's combo, but missing a Droplet does not. + +The visual difference between Drops and Droplets is that a Drop is twice as big as Droplets are. + + + + From 146a2106a7bac25802d63f4963581e9303ad44b9 Mon Sep 17 00:00:00 2001 From: Pennek Date: Sun, 5 Jul 2020 21:10:48 +0200 Subject: [PATCH 03/14] kiai time --- wiki/Beatmap_Editor/Kiai_Time/de.md | 3 +++ wiki/Beatmap_Editor/Kiai_Time/en.md | 30 ++++++++++++++++------------- wiki/Beatmap_Editor/Kiai_Time/es.md | 3 +++ wiki/Beatmap_Editor/Kiai_Time/fr.md | 1 + wiki/Beatmap_Editor/Kiai_Time/ja.md | 4 ++++ wiki/Beatmap_Editor/Kiai_Time/pl.md | 4 ++++ wiki/Beatmap_Editor/Kiai_Time/pt.md | 4 ++++ wiki/Beatmap_Editor/Kiai_Time/ru.md | 4 ++++ wiki/Beatmap_Editor/Kiai_Time/th.md | 4 ++++ 9 files changed, 44 insertions(+), 13 deletions(-) diff --git a/wiki/Beatmap_Editor/Kiai_Time/de.md b/wiki/Beatmap_Editor/Kiai_Time/de.md index 0d5f1c595226..9d3349ca94bd 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/de.md +++ b/wiki/Beatmap_Editor/Kiai_Time/de.md @@ -1,3 +1,6 @@ +--- +outdated: true +--- # Kiai Time **Kiai Time** wird vom [Mapper](/wiki/Glossary) in der [Beatmap](/wiki/Beatmaps) zwischen 2 [Timingsektionen](/wiki/Beatmap_Editor/Timing) definiert. Sie werden es durch die Sternenfontänen und an dem Geblinke auf Ihrem Bildschirm erkennen, danach werden alle [Hit Objekte](/wiki/Hit_Objects) im Rhythmus zum Hauptbeat anfangen zu blinken und Sterne werden aus Ihrem Cursor erscheinen, wenn Sie einen [Hit Circle](/wiki/Hit_Objects) anklicken oder von Ihrem Cursor runterfallen, wenn Sie die Taste bei einem [Slider](/wiki/Hit_Objects) oder einem [Spinner](/wiki/Hit_Objects) durchgehend gedrückt halten. diff --git a/wiki/Beatmap_Editor/Kiai_Time/en.md b/wiki/Beatmap_Editor/Kiai_Time/en.md index 8249d24399cd..fe4bc1cb9adb 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/en.md +++ b/wiki/Beatmap_Editor/Kiai_Time/en.md @@ -1,20 +1,24 @@ -# Kiai time +--- +tags: + - timing section +--- -![Stars shower the screen indicating Kiai Time has started.](img/Kiai_Time_test.jpg "Stars shower the screen indicating Kiai Time has started.") +# Kiai Time -![Kiai Time shows in the upper-left of the screen when active during edit mode.](img/Kiai_Time_edit.jpg "Kiai Time shows in the upper-left of the screen when active during edit mode.") +*For regulations surrounding kiai time, see the [Ranking Criteria](/wiki/Ranking_Criteria).* -**Kiai Time** is defined by the [mapper](/wiki/Glossary) on a [beatmap](/wiki/Beatmaps) between 2 [Timing Sections](/wiki/Beatmap_Editor/Timing). You can recognize a Kiai time because the screen flashes and you will see a star fountain, afterwards all [Hit Objects](/wiki/Hit_Objects) will flash at the rhythm of the [main beat](/wiki/Beatmap_Editor/Timing) and stars will explode from the cursor when a [Hit Circle](/wiki/Hit_Objects) is hit or will fall from the cursor when you follow a [slider](/wiki/Hit_Objects) or a [spinner](/wiki/Hit_Objects). +**Kiai Time** is a term given for a "special" timing section to help emphasize a part of a [beatmap](/wiki/Beatmaps). A player can tell if a part of a beatmap has a kiai timing section by seeing added visual effects such as flashing beats, flying stars, and fountains. -## Kiai Time on Beatmapping +While kiai time is active all [hit objects](/wiki/Hit_Objects) will flash at the rhythm of the [main beat](/wiki/Beatmap_Editor/Timing) and stars will explode from the cursor when a [hit circle](/wiki/Hit_Objects) is hit or will fall from the cursor when a [slider](/wiki/Hit_Objects) or [spinner](/wiki/Hit_Objects) is followed. -The most common term for Kiai Time when [editing](/wiki/Beatmap_Editor) beatmaps is the "strongest part of the song" this is normally the chorus of the song, however some songs don't have a chorus, but they do have a strong part for you that feels cool, so you could insert Kiai Time in that section. Be advised however that spamming kiai start sections will cause a spam in kiai fountains. That is unrankable, and mostly hated by players because of the lag it may cause. +## Beatmapping -## Things to take into consideration when using Kiai +Kiai time is most commonly used for the "strongest part of a song" which usually is the chorus. Since kiai sections are the strongest part of a song it makes sense that they are slightly more challenging than the rest of the mapset to follow the song. -1. On **[osu!taiko](/wiki/Game_Modes/osu!taiko) maps** Kiai sections give 20% more [score](/wiki/Score), so if you're mapping a osu!taiko specific [map](/wiki/Beatmaps), take into consideration that Kiai does affect gameplay. -2. **Be consistent**; it's annoying when you have 3 Kiai sections in different spots on the same [difficulty](/wiki/Difficulties) and all of them sound different. Additionally, it's good that all difficulties from the same [mapper](/wiki/Glossary) have the exact same Kiai times. -3. **Do not use pure white [combo colour](/wiki/Glossary)** (255,255,255); it makes Kiai blinding and hurts the eyes. -4. It's normal that a Kiai section is slightly more challenging than the rest of the mapset, as Kiai time is also the **strongest part of the map**. -5. **[Guest difficulties](/wiki/Glossary) may have different Kiai**. This is due to the fact that not everyone thinks the same spot is the "cool" spot of the beatmap; however Kiai should still be consistent. -6. Colourhaxing to make Kiai have a different set of [combo colours](/wiki/Glossary) is a nice touch. +# osu!taiko + +On [osu!taiko](/wiki/Game_Modes/osu!taiko) maps kiai sections give 20% more [score](/wiki/Score). + + + + diff --git a/wiki/Beatmap_Editor/Kiai_Time/es.md b/wiki/Beatmap_Editor/Kiai_Time/es.md index 9ca9e76f0100..adcaa21d1912 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/es.md +++ b/wiki/Beatmap_Editor/Kiai_Time/es.md @@ -1,3 +1,6 @@ +--- +outdated: true +--- # Momento Kiai ![Las estrellas bañan la pantalla indicando que el Momento Kiai ha comenzado.](img/Kiai_Time_test.jpg "Las estrellas bañan la pantalla indicando que el Tiempo Kiai ha comenzado.") diff --git a/wiki/Beatmap_Editor/Kiai_Time/fr.md b/wiki/Beatmap_Editor/Kiai_Time/fr.md index ab259a5a5dee..b05c040514f9 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/fr.md +++ b/wiki/Beatmap_Editor/Kiai_Time/fr.md @@ -1,5 +1,6 @@ --- no_native_review: true +outdated: true --- # Kiai time diff --git a/wiki/Beatmap_Editor/Kiai_Time/ja.md b/wiki/Beatmap_Editor/Kiai_Time/ja.md index acd64a7e0f8f..0359a06118bd 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/ja.md +++ b/wiki/Beatmap_Editor/Kiai_Time/ja.md @@ -1,3 +1,7 @@ +--- +outdated: true +--- + # Kiaiタイム ![Stars shower the screen indicating Kiai Time has started.](img/Kiai_Time_test.jpg "Stars shower the screen indicating Kiai Time has started.") diff --git a/wiki/Beatmap_Editor/Kiai_Time/pl.md b/wiki/Beatmap_Editor/Kiai_Time/pl.md index 2a31b21dc4be..f4508605a89c 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/pl.md +++ b/wiki/Beatmap_Editor/Kiai_Time/pl.md @@ -1,3 +1,7 @@ +--- +outdated: true +--- + # Czas Kiai ![Fontanna gwiazd oznaczająca początek Czasu Kiai.](img/Kiai_Time_test.jpg "Fontanna gwiazd oznaczająca początek Czasu Kiai.") diff --git a/wiki/Beatmap_Editor/Kiai_Time/pt.md b/wiki/Beatmap_Editor/Kiai_Time/pt.md index cada77fbe53b..c81d9d3e2bb1 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/pt.md +++ b/wiki/Beatmap_Editor/Kiai_Time/pt.md @@ -1,3 +1,7 @@ +--- +outdated: true +--- + # Kiai Time ![Lançamento de estrelas na tela indicando que o Kiai Time foi ativado.](img/Kiai_Time_test.jpg "Lançamento de estrelas na tela indicando que o Kiai Time foi ativado.") diff --git a/wiki/Beatmap_Editor/Kiai_Time/ru.md b/wiki/Beatmap_Editor/Kiai_Time/ru.md index 96c4e7bde3f0..d037efd3db9c 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/ru.md +++ b/wiki/Beatmap_Editor/Kiai_Time/ru.md @@ -1,3 +1,7 @@ +--- +outdated: true +--- + # Kiai Time ![Фонтаны звёзд показывают, что киаи начался](img/Kiai_Time_test.jpg "Фонтаны звёзд показывают, что киаи начался") diff --git a/wiki/Beatmap_Editor/Kiai_Time/th.md b/wiki/Beatmap_Editor/Kiai_Time/th.md index c8eefe099f57..e67a6a43ca01 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/th.md +++ b/wiki/Beatmap_Editor/Kiai_Time/th.md @@ -1,3 +1,7 @@ +--- +outdated: true +--- + # Kiai Time ![ดาวที่แสดงขึ้นเป็นตัวประกอบบนจอเวลาถึงจุด kiai.](img/Kiai_Time_test.jpg "ดาวที่แสดงขึ้นเป็นตัวประกอบบนจอเวลาถึงจุด kiai.") From 88cc17adb1d0d3aac038d6d5196f826370c24010 Mon Sep 17 00:00:00 2001 From: Pennek Date: Sun, 5 Jul 2020 21:23:31 +0200 Subject: [PATCH 04/14] katu --- wiki/Glossary/Katu/en.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 wiki/Glossary/Katu/en.md diff --git a/wiki/Glossary/Katu/en.md b/wiki/Glossary/Katu/en.md new file mode 100644 index 000000000000..9b7315462e5f --- /dev/null +++ b/wiki/Glossary/Katu/en.md @@ -0,0 +1,14 @@ +--- +tags: + - 100 +--- + +# Katu + +A **katu(喝)**, or *Beat!*, is when you complete a [comboset](/wiki/Beatmapping/Combo/) without achieving the highest level of [accuracy](/wiki/Accuracy/). If instead the comboset was done perfectly a Geki(激) would be achieved. + +This idea originates from the Nintendo DS game Elite Beat Agents which is one of the games the [osu!standard](/wiki/Game_Modes/osu!/) [game mode](/wiki/Game_Modes) is based on. + + + + From b02aa29a9811861c3e42dbf61fe04701c5fb58e4 Mon Sep 17 00:00:00 2001 From: Pennek Date: Sun, 5 Jul 2020 21:29:20 +0200 Subject: [PATCH 05/14] sacrifice my firstborn to remark --- wiki/Beatmap_Editor/Kiai_Time/de.md | 1 + wiki/Beatmap_Editor/Kiai_Time/en.md | 2 +- wiki/Beatmap_Editor/Kiai_Time/es.md | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wiki/Beatmap_Editor/Kiai_Time/de.md b/wiki/Beatmap_Editor/Kiai_Time/de.md index 9d3349ca94bd..f961e8e51574 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/de.md +++ b/wiki/Beatmap_Editor/Kiai_Time/de.md @@ -1,6 +1,7 @@ --- outdated: true --- + # Kiai Time **Kiai Time** wird vom [Mapper](/wiki/Glossary) in der [Beatmap](/wiki/Beatmaps) zwischen 2 [Timingsektionen](/wiki/Beatmap_Editor/Timing) definiert. Sie werden es durch die Sternenfontänen und an dem Geblinke auf Ihrem Bildschirm erkennen, danach werden alle [Hit Objekte](/wiki/Hit_Objects) im Rhythmus zum Hauptbeat anfangen zu blinken und Sterne werden aus Ihrem Cursor erscheinen, wenn Sie einen [Hit Circle](/wiki/Hit_Objects) anklicken oder von Ihrem Cursor runterfallen, wenn Sie die Taste bei einem [Slider](/wiki/Hit_Objects) oder einem [Spinner](/wiki/Hit_Objects) durchgehend gedrückt halten. diff --git a/wiki/Beatmap_Editor/Kiai_Time/en.md b/wiki/Beatmap_Editor/Kiai_Time/en.md index fe4bc1cb9adb..fc1c4524038e 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/en.md +++ b/wiki/Beatmap_Editor/Kiai_Time/en.md @@ -15,7 +15,7 @@ While kiai time is active all [hit objects](/wiki/Hit_Objects) will flash at the Kiai time is most commonly used for the "strongest part of a song" which usually is the chorus. Since kiai sections are the strongest part of a song it makes sense that they are slightly more challenging than the rest of the mapset to follow the song. -# osu!taiko +## osu!taiko On [osu!taiko](/wiki/Game_Modes/osu!taiko) maps kiai sections give 20% more [score](/wiki/Score). diff --git a/wiki/Beatmap_Editor/Kiai_Time/es.md b/wiki/Beatmap_Editor/Kiai_Time/es.md index adcaa21d1912..7c2dfca0af53 100644 --- a/wiki/Beatmap_Editor/Kiai_Time/es.md +++ b/wiki/Beatmap_Editor/Kiai_Time/es.md @@ -1,6 +1,7 @@ --- outdated: true --- + # Momento Kiai ![Las estrellas bañan la pantalla indicando que el Momento Kiai ha comenzado.](img/Kiai_Time_test.jpg "Las estrellas bañan la pantalla indicando que el Tiempo Kiai ha comenzado.") From 0d18f9af7de3abdf6e322d15f0da448f0f7a346f Mon Sep 17 00:00:00 2001 From: Pennek <20502902+Pennek@users.noreply.github.com> Date: Thu, 9 Jul 2020 23:08:03 +0200 Subject: [PATCH 06/14] remove trailing slashes --- wiki/Beatmapping/Hitsound/en.md | 2 +- wiki/Glossary/Juice_Stream/en.md | 2 +- wiki/Glossary/Katu/en.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/Beatmapping/Hitsound/en.md b/wiki/Beatmapping/Hitsound/en.md index 358b890fb58b..8fb016c730d6 100644 --- a/wiki/Beatmapping/Hitsound/en.md +++ b/wiki/Beatmapping/Hitsound/en.md @@ -10,7 +10,7 @@ tags: -**Hitsounds** are the sounds that osu! plays in response to user input when interacting with [hit objects](/wiki/Hit_Objects) in a [game mode](/wiki/Game_Modes/). Hitsounds are used to give auditory feedback to the player to help them judge their [accuracy](/wiki/Accuracy/) in relation to the song. +**Hitsounds** are the sounds that osu! plays in response to user input when interacting with [hit objects](/wiki/Hit_Objects) in a [game mode](/wiki/Game_Modes). Hitsounds are used to give auditory feedback to the player to help them judge their [accuracy](/wiki/Accuracy/) in relation to the song. Hitsound feedback consists of a default sample called a "hit normal", and any combination of whistle, finish, or clap sample additions. Each sample has one of three "sample sets" that change its style: `Normal`, `Soft`, or `Drum`. diff --git a/wiki/Glossary/Juice_Stream/en.md b/wiki/Glossary/Juice_Stream/en.md index fc8b92eac180..92259dde7f74 100644 --- a/wiki/Glossary/Juice_Stream/en.md +++ b/wiki/Glossary/Juice_Stream/en.md @@ -1,6 +1,6 @@ # Juice Stream -**Juice streams** are an element element in [osu!catch](/wiki/Game_Modes/osu!catch/) which includes both Drops and Droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!/), while Droplets give a score of 10, equivalent to the [slider tick](#slider-tick) in osu!standard. +**Juice streams** are an element element in [osu!catch](/wiki/Game_Modes/osu!catch) which includes both Drops and Droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while Droplets give a score of 10, equivalent to the slider tick in osu!standard. Missing a Drop breaks the player's combo, but missing a Droplet does not. diff --git a/wiki/Glossary/Katu/en.md b/wiki/Glossary/Katu/en.md index 9b7315462e5f..22eb137e5257 100644 --- a/wiki/Glossary/Katu/en.md +++ b/wiki/Glossary/Katu/en.md @@ -5,9 +5,9 @@ tags: # Katu -A **katu(喝)**, or *Beat!*, is when you complete a [comboset](/wiki/Beatmapping/Combo/) without achieving the highest level of [accuracy](/wiki/Accuracy/). If instead the comboset was done perfectly a Geki(激) would be achieved. +A **katu(喝)**, or *Beat!*, is when you complete a [comboset](/wiki/Beatmapping/Combo) without achieving the highest level of [accuracy](/wiki/Accuracy). If instead the comboset was done perfectly a Geki(激) would be achieved. -This idea originates from the Nintendo DS game Elite Beat Agents which is one of the games the [osu!standard](/wiki/Game_Modes/osu!/) [game mode](/wiki/Game_Modes) is based on. +This idea originates from the Nintendo DS game Elite Beat Agents which is one of the games the [osu!standard](/wiki/Game_Modes/osu!) [game mode](/wiki/Game_Modes) is based on. From 422e89cd3fe48be0fac47365a2bb2189caeb4317 Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Sun, 2 Aug 2020 08:14:09 -0500 Subject: [PATCH 07/14] Move Kiai_Time to Kiai_time, fix letter casing, apply suggestions --- wiki/Beatmap_Editor/Kiai_Time/en.md | 24 ----------------- .../{Kiai_Time => Kiai_time}/de.md | 0 wiki/Beatmap_Editor/Kiai_time/en.md | 25 ++++++++++++++++++ .../{Kiai_Time => Kiai_time}/es.md | 0 .../{Kiai_Time => Kiai_time}/fr.md | 0 .../img/Kiai_Time_edit.jpg | Bin .../img/Kiai_Time_test.jpg | Bin .../{Kiai_Time => Kiai_time}/ja.md | 0 .../{Kiai_Time => Kiai_time}/pl.md | 0 .../{Kiai_Time => Kiai_time}/pt.md | 0 .../{Kiai_Time => Kiai_time}/ru.md | 0 .../{Kiai_Time => Kiai_time}/th.md | 0 12 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 wiki/Beatmap_Editor/Kiai_Time/en.md rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/de.md (100%) create mode 100644 wiki/Beatmap_Editor/Kiai_time/en.md rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/es.md (100%) rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/fr.md (100%) rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/img/Kiai_Time_edit.jpg (100%) rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/img/Kiai_Time_test.jpg (100%) rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/ja.md (100%) rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/pl.md (100%) rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/pt.md (100%) rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/ru.md (100%) rename wiki/Beatmap_Editor/{Kiai_Time => Kiai_time}/th.md (100%) diff --git a/wiki/Beatmap_Editor/Kiai_Time/en.md b/wiki/Beatmap_Editor/Kiai_Time/en.md deleted file mode 100644 index fc1c4524038e..000000000000 --- a/wiki/Beatmap_Editor/Kiai_Time/en.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -tags: - - timing section ---- - -# Kiai Time - -*For regulations surrounding kiai time, see the [Ranking Criteria](/wiki/Ranking_Criteria).* - -**Kiai Time** is a term given for a "special" timing section to help emphasize a part of a [beatmap](/wiki/Beatmaps). A player can tell if a part of a beatmap has a kiai timing section by seeing added visual effects such as flashing beats, flying stars, and fountains. - -While kiai time is active all [hit objects](/wiki/Hit_Objects) will flash at the rhythm of the [main beat](/wiki/Beatmap_Editor/Timing) and stars will explode from the cursor when a [hit circle](/wiki/Hit_Objects) is hit or will fall from the cursor when a [slider](/wiki/Hit_Objects) or [spinner](/wiki/Hit_Objects) is followed. - -## Beatmapping - -Kiai time is most commonly used for the "strongest part of a song" which usually is the chorus. Since kiai sections are the strongest part of a song it makes sense that they are slightly more challenging than the rest of the mapset to follow the song. - -## osu!taiko - -On [osu!taiko](/wiki/Game_Modes/osu!taiko) maps kiai sections give 20% more [score](/wiki/Score). - - - - diff --git a/wiki/Beatmap_Editor/Kiai_Time/de.md b/wiki/Beatmap_Editor/Kiai_time/de.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/de.md rename to wiki/Beatmap_Editor/Kiai_time/de.md diff --git a/wiki/Beatmap_Editor/Kiai_time/en.md b/wiki/Beatmap_Editor/Kiai_time/en.md new file mode 100644 index 000000000000..a2abcd5387b3 --- /dev/null +++ b/wiki/Beatmap_Editor/Kiai_time/en.md @@ -0,0 +1,25 @@ +--- +tags: + - timing section + - kiai mode +--- + +# Kiai time + +*For regulations surrounding kiai, see the [Ranking Criteria](/wiki/Ranking_Criteria).* + +**Kiai Time** (or *kiai*) is a term given for a "special" timing section to help emphasize a part of a [beatmap](/wiki/Beatmaps). Players can tell if a part of a beatmap has a kiai timing section if they see added visual effects in the background (e.g., flashing beats, flying stars, and fountains). + +While kiai is active, all [hit objects](/wiki/Hit_object) will flash at the rhythm of the [main beat](/wiki/Beatmap_Editor/Timing) and stars will explode from the cursor when a [hit circle](/wiki/Hit_object/Hit_circle) is hit. Otherwise, they will fall from the cursor when a [slider](/wiki/Hit_object/Slider) or [spinner](/wiki/Hit_object/Slider) is followed. + +## Beatmapping + +Kiai time is most commonly used for the "strongest part of a song" which is usually the chorus. Since kiai sections are the strongest part of a song, they are typically slightly more challenging than the rest of the [beatmapset](/wiki/Beatmapsets) to follow the song. + +## osu!taiko + +On [osu!taiko](/wiki/Game_Modes/osu!taiko) beatmaps, kiai sections give 20% more [score](/wiki/Score). + + + + diff --git a/wiki/Beatmap_Editor/Kiai_Time/es.md b/wiki/Beatmap_Editor/Kiai_time/es.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/es.md rename to wiki/Beatmap_Editor/Kiai_time/es.md diff --git a/wiki/Beatmap_Editor/Kiai_Time/fr.md b/wiki/Beatmap_Editor/Kiai_time/fr.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/fr.md rename to wiki/Beatmap_Editor/Kiai_time/fr.md diff --git a/wiki/Beatmap_Editor/Kiai_Time/img/Kiai_Time_edit.jpg b/wiki/Beatmap_Editor/Kiai_time/img/Kiai_Time_edit.jpg similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/img/Kiai_Time_edit.jpg rename to wiki/Beatmap_Editor/Kiai_time/img/Kiai_Time_edit.jpg diff --git a/wiki/Beatmap_Editor/Kiai_Time/img/Kiai_Time_test.jpg b/wiki/Beatmap_Editor/Kiai_time/img/Kiai_Time_test.jpg similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/img/Kiai_Time_test.jpg rename to wiki/Beatmap_Editor/Kiai_time/img/Kiai_Time_test.jpg diff --git a/wiki/Beatmap_Editor/Kiai_Time/ja.md b/wiki/Beatmap_Editor/Kiai_time/ja.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/ja.md rename to wiki/Beatmap_Editor/Kiai_time/ja.md diff --git a/wiki/Beatmap_Editor/Kiai_Time/pl.md b/wiki/Beatmap_Editor/Kiai_time/pl.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/pl.md rename to wiki/Beatmap_Editor/Kiai_time/pl.md diff --git a/wiki/Beatmap_Editor/Kiai_Time/pt.md b/wiki/Beatmap_Editor/Kiai_time/pt.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/pt.md rename to wiki/Beatmap_Editor/Kiai_time/pt.md diff --git a/wiki/Beatmap_Editor/Kiai_Time/ru.md b/wiki/Beatmap_Editor/Kiai_time/ru.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/ru.md rename to wiki/Beatmap_Editor/Kiai_time/ru.md diff --git a/wiki/Beatmap_Editor/Kiai_Time/th.md b/wiki/Beatmap_Editor/Kiai_time/th.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_Time/th.md rename to wiki/Beatmap_Editor/Kiai_time/th.md From 4bd31b0e4538919e149080bb94c426df46206d9d Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Sun, 2 Aug 2020 08:24:21 -0500 Subject: [PATCH 08/14] Apply suggestions Co-authored-by: paper-toaster <66349361+paper-toaster@users.noreply.github.com> --- wiki/Beatmapping/Hitsound/en.md | 6 +++--- wiki/Glossary/Ignore_List/en.md | 12 ------------ wiki/Glossary/Ignore_list/en.md | 12 ++++++++++++ wiki/Glossary/{Juice_Stream => Juice_stream}/en.md | 6 +----- 4 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 wiki/Glossary/Ignore_List/en.md create mode 100644 wiki/Glossary/Ignore_list/en.md rename wiki/Glossary/{Juice_Stream => Juice_stream}/en.md (65%) diff --git a/wiki/Beatmapping/Hitsound/en.md b/wiki/Beatmapping/Hitsound/en.md index 8fb016c730d6..2734e769008c 100644 --- a/wiki/Beatmapping/Hitsound/en.md +++ b/wiki/Beatmapping/Hitsound/en.md @@ -10,13 +10,13 @@ tags: -**Hitsounds** are the sounds that osu! plays in response to user input when interacting with [hit objects](/wiki/Hit_Objects) in a [game mode](/wiki/Game_Modes). Hitsounds are used to give auditory feedback to the player to help them judge their [accuracy](/wiki/Accuracy/) in relation to the song. +**Hitsounds** are the sounds that osu! plays in response to user input when interacting with [hit objects](/wiki/Hit_objects) in a [game mode](/wiki/Game_Modes). Hitsounds are used to give auditory feedback to the player to help them judge their [accuracy](/wiki/Accuracy) in relation to the song. Hitsound feedback consists of a default sample called a "hit normal", and any combination of whistle, finish, or clap sample additions. Each sample has one of three "sample sets" that change its style: `Normal`, `Soft`, or `Drum`. Beatmappers can replace any default sound samples with custom samples using a [beatmapset](/wiki/Beatmaps/Beatmapsets)'s folder. A player's [skin](/wiki/Skinning) can also replace default hitsounds on all beatmaps. Details on hitsound samples can be found in the [hitsound skinning](/wiki/Skinning/Sounds#hitsounds) article. -[Spinners](/wiki/Hit_Objects/Spinner) and [sliders](/wiki/Hit_Objects/Slider) have additional spinner spin, spinner bonus, slider slide, and slider tick hitsounds. +[Spinners](/wiki/Hit_object/Spinner) and [sliders](/wiki/Hit_object/Slider) have additional spinner spin, spinner bonus, slider slide, and slider tick hitsounds. ## Active hitsound @@ -30,7 +30,7 @@ Hitsounds can be added through storyboarding, but because they don't correlate t ## Keysound -A keysound is a hitsound sample that is extremely similar or directly taken from the song and is used to replicate the pitch of the song's notes. This method of hitsounding usually provides low feedback to the player, but can be interesting and make sections of a map stand out when applied well. +A keysound is a hitsound sample that is extremely similar to, or directly taken from, the song and is used to replicate the pitch of the song's notes. This method of hitsounding usually provides low feedback to the player, but can make playing certain beatmaps more interesting and make sections of a map stand out when applied well. ## In osu!taiko diff --git a/wiki/Glossary/Ignore_List/en.md b/wiki/Glossary/Ignore_List/en.md deleted file mode 100644 index 8e1df88d1e82..000000000000 --- a/wiki/Glossary/Ignore_List/en.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -tags: - - blacklist ---- - -# Ignore List - -The **ignore list** is a blacklist of words (or users) that the player does not want to be displayed in the [chat console](/wiki/chat_console). It can be accessed and modified in the [user settings menu](https://osu.ppy.sh/home/account/edit) under the privacy tab. - - - - diff --git a/wiki/Glossary/Ignore_list/en.md b/wiki/Glossary/Ignore_list/en.md new file mode 100644 index 000000000000..a763b00288e5 --- /dev/null +++ b/wiki/Glossary/Ignore_list/en.md @@ -0,0 +1,12 @@ +--- +tags: + - blacklist +--- + +# Ignore list + +The **ignore list** is a blacklist of words (or users) that a player does not want to be displayed in the [chat console](/wiki/chat_console). The ignore list can be accessed and modified in the [user settings menu](https://osu.ppy.sh/home/account/edit) under the privacy tab. + + + + diff --git a/wiki/Glossary/Juice_Stream/en.md b/wiki/Glossary/Juice_stream/en.md similarity index 65% rename from wiki/Glossary/Juice_Stream/en.md rename to wiki/Glossary/Juice_stream/en.md index 92259dde7f74..6699c5210426 100644 --- a/wiki/Glossary/Juice_Stream/en.md +++ b/wiki/Glossary/Juice_stream/en.md @@ -1,11 +1,7 @@ -# Juice Stream +# Juice stream **Juice streams** are an element element in [osu!catch](/wiki/Game_Modes/osu!catch) which includes both Drops and Droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while Droplets give a score of 10, equivalent to the slider tick in osu!standard. -Missing a Drop breaks the player's combo, but missing a Droplet does not. - -The visual difference between Drops and Droplets is that a Drop is twice as big as Droplets are. - From e1b81b7ef7f260c8ea9a89c3610ba86849b8168f Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Sun, 2 Aug 2020 08:31:38 -0500 Subject: [PATCH 09/14] Fix letter casing in Juice stream --- wiki/Glossary/Juice_stream/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/Glossary/Juice_stream/en.md b/wiki/Glossary/Juice_stream/en.md index 6699c5210426..f7762edd9dd0 100644 --- a/wiki/Glossary/Juice_stream/en.md +++ b/wiki/Glossary/Juice_stream/en.md @@ -1,6 +1,6 @@ # Juice stream -**Juice streams** are an element element in [osu!catch](/wiki/Game_Modes/osu!catch) which includes both Drops and Droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while Droplets give a score of 10, equivalent to the slider tick in osu!standard. +**Juice streams** are an element element in [osu!catch](/wiki/Game_Modes/osu!catch) which includes both drops and droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while droplets give a score of 10, equivalent to the slider tick in osu!standard. From a456f6dd49de5a01b03bfb0d4194308e849170d5 Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Sun, 2 Aug 2020 08:32:15 -0500 Subject: [PATCH 10/14] Make Katu more like Geki --- wiki/Glossary/Katu/en.md | 14 -------------- wiki/Katu/en.md | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 wiki/Glossary/Katu/en.md create mode 100644 wiki/Katu/en.md diff --git a/wiki/Glossary/Katu/en.md b/wiki/Glossary/Katu/en.md deleted file mode 100644 index 22eb137e5257..000000000000 --- a/wiki/Glossary/Katu/en.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -tags: - - 100 ---- - -# Katu - -A **katu(喝)**, or *Beat!*, is when you complete a [comboset](/wiki/Beatmapping/Combo) without achieving the highest level of [accuracy](/wiki/Accuracy). If instead the comboset was done perfectly a Geki(激) would be achieved. - -This idea originates from the Nintendo DS game Elite Beat Agents which is one of the games the [osu!standard](/wiki/Game_Modes/osu!) [game mode](/wiki/Game_Modes) is based on. - - - - diff --git a/wiki/Katu/en.md b/wiki/Katu/en.md new file mode 100644 index 000000000000..6b553756ec39 --- /dev/null +++ b/wiki/Katu/en.md @@ -0,0 +1,14 @@ +--- +stub: true +tags: + - 100 + - katsu +--- + +# Katu + +*See also: [Geki](/wiki/Geki)* + +**Katu (喝)**, *Katsu*, or *Beat!*, is a [scoring](/wiki/Score) term used when a player has completed a comboset without achieving the highest possible [accuracy](/wiki/Gameplay/Accuracy) on every note. This idea originates from the Nintendo DS game Elite Beat Agents which is one of the games the [osu!standard](/wiki/Game_Modes/osu!) [game mode](/wiki/Game_Modes) is based on. + + From e18f6c1b0cae7f24ea5ceddaf766409f68d28e80 Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Sun, 2 Aug 2020 08:34:54 -0500 Subject: [PATCH 11/14] Add stub mark, remove comment --- wiki/Beatmap_Editor/Kiai_time/en.md | 3 +-- wiki/Beatmapping/Hitsound/en.md | 3 +-- wiki/Glossary/Ignore_list/en.md | 3 +-- wiki/Glossary/Juice_stream/en.md | 6 ++++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/wiki/Beatmap_Editor/Kiai_time/en.md b/wiki/Beatmap_Editor/Kiai_time/en.md index a2abcd5387b3..913a46c61cce 100644 --- a/wiki/Beatmap_Editor/Kiai_time/en.md +++ b/wiki/Beatmap_Editor/Kiai_time/en.md @@ -1,4 +1,5 @@ --- +stub: true tags: - timing section - kiai mode @@ -21,5 +22,3 @@ Kiai time is most commonly used for the "strongest part of a song" which is usua On [osu!taiko](/wiki/Game_Modes/osu!taiko) beatmaps, kiai sections give 20% more [score](/wiki/Score). - - diff --git a/wiki/Beatmapping/Hitsound/en.md b/wiki/Beatmapping/Hitsound/en.md index 2734e769008c..419d9e6e6b72 100644 --- a/wiki/Beatmapping/Hitsound/en.md +++ b/wiki/Beatmapping/Hitsound/en.md @@ -1,4 +1,5 @@ --- +stub: true tags: - hit sounds - hitsounds @@ -37,5 +38,3 @@ A keysound is a hitsound sample that is extremely similar to, or directly taken Unlike the other [game modes](/wiki/Game_Modes), [osu!taiko](/wiki/Game_Modes/osu!taiko) hitsounds directly affect the gameplay of their maps. Kats are distinguished from Dons using whistles and claps, and large notes are distinguished from normal ones using finishers. osu!taiko's default samples are unique to the mode, and mappers typically do not override them. - - diff --git a/wiki/Glossary/Ignore_list/en.md b/wiki/Glossary/Ignore_list/en.md index a763b00288e5..7cc712cf17b2 100644 --- a/wiki/Glossary/Ignore_list/en.md +++ b/wiki/Glossary/Ignore_list/en.md @@ -1,4 +1,5 @@ --- +stub: true tags: - blacklist --- @@ -8,5 +9,3 @@ tags: The **ignore list** is a blacklist of words (or users) that a player does not want to be displayed in the [chat console](/wiki/chat_console). The ignore list can be accessed and modified in the [user settings menu](https://osu.ppy.sh/home/account/edit) under the privacy tab. - - diff --git a/wiki/Glossary/Juice_stream/en.md b/wiki/Glossary/Juice_stream/en.md index f7762edd9dd0..866778c0b054 100644 --- a/wiki/Glossary/Juice_stream/en.md +++ b/wiki/Glossary/Juice_stream/en.md @@ -1,7 +1,9 @@ +--- +stub: true +--- + # Juice stream **Juice streams** are an element element in [osu!catch](/wiki/Game_Modes/osu!catch) which includes both drops and droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while droplets give a score of 10, equivalent to the slider tick in osu!standard. - - From 2e711b31fe548429ebf9b9154017fb78fe6ee952 Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Sun, 2 Aug 2020 08:37:49 -0500 Subject: [PATCH 12/14] Move kiai time to top level, juice stream to hit objects, redirects --- wiki/Glossary/Juice_stream/en.md | 9 --------- wiki/Hit_object/Juice_stream/en.md | 9 +++++++++ wiki/{Beatmap_Editor => }/Kiai_time/de.md | 0 wiki/{Beatmap_Editor => }/Kiai_time/en.md | 0 wiki/{Beatmap_Editor => }/Kiai_time/es.md | 0 wiki/{Beatmap_Editor => }/Kiai_time/fr.md | 0 .../Kiai_time/img/Kiai_Time_edit.jpg | Bin .../Kiai_time/img/Kiai_Time_test.jpg | Bin wiki/{Beatmap_Editor => }/Kiai_time/ja.md | 0 wiki/{Beatmap_Editor => }/Kiai_time/pl.md | 0 wiki/{Beatmap_Editor => }/Kiai_time/pt.md | 0 wiki/{Beatmap_Editor => }/Kiai_time/ru.md | 0 wiki/{Beatmap_Editor => }/Kiai_time/th.md | 0 wiki/redirect.yaml | 3 +++ 14 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 wiki/Glossary/Juice_stream/en.md create mode 100644 wiki/Hit_object/Juice_stream/en.md rename wiki/{Beatmap_Editor => }/Kiai_time/de.md (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/en.md (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/es.md (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/fr.md (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/img/Kiai_Time_edit.jpg (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/img/Kiai_Time_test.jpg (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/ja.md (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/pl.md (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/pt.md (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/ru.md (100%) rename wiki/{Beatmap_Editor => }/Kiai_time/th.md (100%) diff --git a/wiki/Glossary/Juice_stream/en.md b/wiki/Glossary/Juice_stream/en.md deleted file mode 100644 index 866778c0b054..000000000000 --- a/wiki/Glossary/Juice_stream/en.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -stub: true ---- - -# Juice stream - -**Juice streams** are an element element in [osu!catch](/wiki/Game_Modes/osu!catch) which includes both drops and droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while droplets give a score of 10, equivalent to the slider tick in osu!standard. - - diff --git a/wiki/Hit_object/Juice_stream/en.md b/wiki/Hit_object/Juice_stream/en.md new file mode 100644 index 000000000000..12e0061b1bb9 --- /dev/null +++ b/wiki/Hit_object/Juice_stream/en.md @@ -0,0 +1,9 @@ +--- +stub: true +--- + +# Juice stream + +**Juice streams** are an element in [osu!catch](/wiki/Game_Modes/osu!catch) which includes both drops and droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while droplets give a score of 10, equivalent to the slider tick in osu!standard. + + diff --git a/wiki/Beatmap_Editor/Kiai_time/de.md b/wiki/Kiai_time/de.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/de.md rename to wiki/Kiai_time/de.md diff --git a/wiki/Beatmap_Editor/Kiai_time/en.md b/wiki/Kiai_time/en.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/en.md rename to wiki/Kiai_time/en.md diff --git a/wiki/Beatmap_Editor/Kiai_time/es.md b/wiki/Kiai_time/es.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/es.md rename to wiki/Kiai_time/es.md diff --git a/wiki/Beatmap_Editor/Kiai_time/fr.md b/wiki/Kiai_time/fr.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/fr.md rename to wiki/Kiai_time/fr.md diff --git a/wiki/Beatmap_Editor/Kiai_time/img/Kiai_Time_edit.jpg b/wiki/Kiai_time/img/Kiai_Time_edit.jpg similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/img/Kiai_Time_edit.jpg rename to wiki/Kiai_time/img/Kiai_Time_edit.jpg diff --git a/wiki/Beatmap_Editor/Kiai_time/img/Kiai_Time_test.jpg b/wiki/Kiai_time/img/Kiai_Time_test.jpg similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/img/Kiai_Time_test.jpg rename to wiki/Kiai_time/img/Kiai_Time_test.jpg diff --git a/wiki/Beatmap_Editor/Kiai_time/ja.md b/wiki/Kiai_time/ja.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/ja.md rename to wiki/Kiai_time/ja.md diff --git a/wiki/Beatmap_Editor/Kiai_time/pl.md b/wiki/Kiai_time/pl.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/pl.md rename to wiki/Kiai_time/pl.md diff --git a/wiki/Beatmap_Editor/Kiai_time/pt.md b/wiki/Kiai_time/pt.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/pt.md rename to wiki/Kiai_time/pt.md diff --git a/wiki/Beatmap_Editor/Kiai_time/ru.md b/wiki/Kiai_time/ru.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/ru.md rename to wiki/Kiai_time/ru.md diff --git a/wiki/Beatmap_Editor/Kiai_time/th.md b/wiki/Kiai_time/th.md similarity index 100% rename from wiki/Beatmap_Editor/Kiai_time/th.md rename to wiki/Kiai_time/th.md diff --git a/wiki/redirect.yaml b/wiki/redirect.yaml index f17b21554c7b..e847f48205ab 100644 --- a/wiki/redirect.yaml +++ b/wiki/redirect.yaml @@ -1623,3 +1623,6 @@ # Deadlink "storyboard_editor": "Beatmap_Editor/Design" + +# Moved kiai time to top level +"beatmap_editor/kiai_time": "Kiai_time" From 6d516bb1cff17f732056207d32c3e91bf9aeb396 Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Sun, 2 Aug 2020 09:33:03 -0500 Subject: [PATCH 13/14] Apply missed suggestions Co-authored-by: paper-toaster <66349361+paper-toaster@users.noreply.github.com> --- wiki/Beatmapping/Hitsound/en.md | 2 +- wiki/Hit_object/Juice_stream/en.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wiki/Beatmapping/Hitsound/en.md b/wiki/Beatmapping/Hitsound/en.md index 419d9e6e6b72..479eb58c14e6 100644 --- a/wiki/Beatmapping/Hitsound/en.md +++ b/wiki/Beatmapping/Hitsound/en.md @@ -11,7 +11,7 @@ tags: -**Hitsounds** are the sounds that osu! plays in response to user input when interacting with [hit objects](/wiki/Hit_objects) in a [game mode](/wiki/Game_Modes). Hitsounds are used to give auditory feedback to the player to help them judge their [accuracy](/wiki/Accuracy) in relation to the song. +**Hitsounds** are the sounds that osu! plays in response to user input when interacting with [hit objects](/wiki/Hit_Objects). Hitsounds are typically used to give auditory feedback to the player to help them judge their [accuracy](/wiki/Accuracy/) in relation to the song. Hitsound feedback consists of a default sample called a "hit normal", and any combination of whistle, finish, or clap sample additions. Each sample has one of three "sample sets" that change its style: `Normal`, `Soft`, or `Drum`. diff --git a/wiki/Hit_object/Juice_stream/en.md b/wiki/Hit_object/Juice_stream/en.md index 12e0061b1bb9..fa22b65b4824 100644 --- a/wiki/Hit_object/Juice_stream/en.md +++ b/wiki/Hit_object/Juice_stream/en.md @@ -4,6 +4,8 @@ stub: true # Juice stream -**Juice streams** are an element in [osu!catch](/wiki/Game_Modes/osu!catch) which includes both drops and droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while droplets give a score of 10, equivalent to the slider tick in osu!standard. +*See also: [Score](/wiki/Score)* + +**Juice streams** are an element in [osu!catch](/wiki/Game_Modes/osu!catch) which include both drops and droplets. Drops give a score of 100, equivalent to slider ticks in [osu!standard](/wiki/Game_Modes/osu!), while droplets give a score of 10, equivalent to the slider tick in osu!standard. From 18e07451066ae3df3974b1c8ff200c8787bf79d3 Mon Sep 17 00:00:00 2001 From: MegaApple_Pi Date: Wed, 2 Sep 2020 21:34:46 -0500 Subject: [PATCH 14/14] Update links, fix hatnote formatting, uncomment Geki hatnote --- wiki/Geki/en.md | 2 +- wiki/Katu/en.md | 4 ++-- wiki/Kiai_time/en.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wiki/Geki/en.md b/wiki/Geki/en.md index eec5b673c757..cf91c404887d 100644 --- a/wiki/Geki/en.md +++ b/wiki/Geki/en.md @@ -7,7 +7,7 @@ tags: # Geki - +*See also: [Katu](/wiki/Katu)* **Geki (激)**, or *Elite Beat!*, is a [scoring](/wiki/Score) term used when a player has completed a comboset with the highest possible [accuracy](/wiki/Gameplay/Accuracy) on every note. This idea originates from the Nintendo DS game Elite Beat Agents in which the [osu!standard](/wiki/Game_mode/osu!) [game mode](/wiki/Game_mode) is based on. diff --git a/wiki/Katu/en.md b/wiki/Katu/en.md index 6b553756ec39..8d419f7c63c4 100644 --- a/wiki/Katu/en.md +++ b/wiki/Katu/en.md @@ -1,7 +1,7 @@ --- stub: true tags: - - 100 + - "100" - katsu --- @@ -9,6 +9,6 @@ tags: *See also: [Geki](/wiki/Geki)* -**Katu (喝)**, *Katsu*, or *Beat!*, is a [scoring](/wiki/Score) term used when a player has completed a comboset without achieving the highest possible [accuracy](/wiki/Gameplay/Accuracy) on every note. This idea originates from the Nintendo DS game Elite Beat Agents which is one of the games the [osu!standard](/wiki/Game_Modes/osu!) [game mode](/wiki/Game_Modes) is based on. +**Katu (喝)**, *Katsu*, or *Beat!*, is a [scoring](/wiki/Score) term used when a player has completed a comboset without achieving the highest possible [accuracy](/wiki/Gameplay/Accuracy) on every note. This idea originates from the Nintendo DS game Elite Beat Agents which is one of the games the [osu!standard](/wiki/Game_mode/osu!) [game mode](/wiki/Game_mode) is based on. diff --git a/wiki/Kiai_time/en.md b/wiki/Kiai_time/en.md index 913a46c61cce..e87a89053b8a 100644 --- a/wiki/Kiai_time/en.md +++ b/wiki/Kiai_time/en.md @@ -7,7 +7,7 @@ tags: # Kiai time -*For regulations surrounding kiai, see the [Ranking Criteria](/wiki/Ranking_Criteria).* +*For regulations surrounding kiai time, see: [Ranking Criteria](/wiki/Ranking_Criteria)* **Kiai Time** (or *kiai*) is a term given for a "special" timing section to help emphasize a part of a [beatmap](/wiki/Beatmaps). Players can tell if a part of a beatmap has a kiai timing section if they see added visual effects in the background (e.g., flashing beats, flying stars, and fountains).