AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

health dies yay

Browse Source
This commit is contained in:
craftersshaft 2021-05-27 14:22:57 -04:00
parent 7a53d1ee08
commit ec2a16b025
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/ModchartState.hx
View File

@ -328,7 +328,6 @@ class ModchartState
// get some fukin globals up in here bois // get some fukin globals up in here bois
setVar("difficulty", PlayState.storyDifficulty); setVar("difficulty", PlayState.storyDifficulty);
setVar("health", PlayState.instance.health);
setVar("bpm", Conductor.bpm); setVar("bpm", Conductor.bpm);
setVar("scrollspeed", FlxG.save.data.scrollSpeed != 1 ? FlxG.save.data.scrollSpeed : PlayState.SONG.speed); setVar("scrollspeed", FlxG.save.data.scrollSpeed != 1 ? FlxG.save.data.scrollSpeed : PlayState.SONG.speed);
setVar("fpsCap", FlxG.save.data.fpsCap); setVar("fpsCap", FlxG.save.data.fpsCap);

20
source/PlayState.hx
View File

@ -125,7 +125,7 @@ class PlayState extends MusicBeatState
private var curSong:String = ""; private var curSong:String = "";
private var gfSpeed:Int = 1; private var gfSpeed:Int = 1;
public var health:Float = 1; //making public for modchart's sake, but things could go wrong private var health:Float = 1;
private var combo:Int = 0; private var combo:Int = 0;
public static var misses:Int = 0; public static var misses:Int = 0;
private var accuracy:Float = 0.00; private var accuracy:Float = 0.00;
@ -1833,9 +1833,6 @@ class PlayState extends MusicBeatState
if (health > 2) if (health > 2)
health = 2; health = 2;
#if windows
if (executeModchart && luaModchart != null){luaModchart.setVar('health', health);};
#end
if (healthBar.percent < 20) if (healthBar.percent < 20)
iconP1.animation.curAnim.curFrame = 1; iconP1.animation.curAnim.curFrame = 1;
else else
@ -2364,9 +2361,6 @@ class PlayState extends MusicBeatState
else else
{ {
health -= 0.075; health -= 0.075;
#if windows
if (executeModchart && luaModchart != null){ luaModchart.setVar('health', health);};
#end
vocals.volume = 0; vocals.volume = 0;
if (theFunne) if (theFunne)
noteMiss(daNote.noteData, daNote); noteMiss(daNote.noteData, daNote);
@ -2562,9 +2556,6 @@ class PlayState extends MusicBeatState
combo = 0; combo = 0;
misses++; misses++;
health -= 0.2; health -= 0.2;
#if windows
if (executeModchart && luaModchart != null){ luaModchart.setVar('health', health);};
#end
ss = false; ss = false;
shits++; shits++;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
@ -2573,9 +2564,6 @@ class PlayState extends MusicBeatState
daRating = 'bad'; daRating = 'bad';
score = 0; score = 0;
health -= 0.06; health -= 0.06;
#if windows
if (executeModchart && luaModchart != null){ luaModchart.setVar('health', health);};
#end
ss = false; ss = false;
bads++; bads++;
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
@ -2587,17 +2575,11 @@ class PlayState extends MusicBeatState
goods++; goods++;
if (health < 2) if (health < 2)
health += 0.04; health += 0.04;
#if windows
if (executeModchart && luaModchart != null){ luaModchart.setVar('health', health);};
#end
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
totalNotesHit += 0.75; totalNotesHit += 0.75;
case 'sick': case 'sick':
if (health < 2) if (health < 2)
health += 0.1; health += 0.1;
#if windows
if (executeModchart && luaModchart != null){ luaModchart.setVar('health', health);};
#end
if (FlxG.save.data.accuracyMod == 0) if (FlxG.save.data.accuracyMod == 0)
totalNotesHit += 1; totalNotesHit += 1;
sicks++; sicks++;