diff --git a/CHANGELOG.md b/CHANGELOG.md index 63e3cab38..1c3c07e8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 3 AWESOME PICO VS. DARNELL SONGS!! - Character offset editor / spritesheet viewer ## Changed +- Health gain is different depending on how accurate you hit notes! +- slight less health gained on sustain notes - The wave-y effect on Thorns for the school is now a shader, instead of a pre-baked animation! ## [0.2.8] - 2021-04-18 (note, this one is iffy cuz we slacked wit it lol!) diff --git a/source/PlayState.hx b/source/PlayState.hx index 28c26d310..3d946b6ff 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2342,25 +2342,39 @@ class PlayState extends MusicBeatState var isSick:Bool = true; + var healthMulti:Float = 1; + + if (daNote.noteData >= 0) + healthMulti *= 0.023; + else + healthMulti *= 0.002; + if (noteDiff > Note.HIT_WINDOW * Note.BAD_THRESHOLD) { + healthMulti *= 0; // no health on shit note daRating = 'shit'; score = 50; isSick = false; // shitty copypaste on this literally just because im lazy and tired lol! } else if (noteDiff > Note.HIT_WINDOW * Note.GOOD_THRESHOLD) { + healthMulti *= 0.5; + daRating = 'bad'; score = 100; isSick = false; } else if (noteDiff > Note.HIT_WINDOW * Note.SICK_THRESHOLD) { + healthMulti *= 0.70; + daRating = 'good'; score = 200; isSick = false; } + health += healthMulti; + if (isSick) { var noteSplash:NoteSplash = grpNoteSplashes.recycle(NoteSplash); @@ -2815,11 +2829,6 @@ class PlayState extends MusicBeatState popUpScore(note.strumTime, note); } - if (note.noteData >= 0) - health += 0.023; - else - health += 0.004; - switch (note.noteData) { case 0: