Skip to content

Commit

Permalink
Merge branch 'JordanSantiagoYT-main'
Browse files Browse the repository at this point in the history
  • Loading branch information
PatoFlamejanteTV committed Nov 14, 2024
2 parents 7d738a8 + 8022950 commit 9893cec
Show file tree
Hide file tree
Showing 3 changed files with 213 additions and 271 deletions.
7 changes: 1 addition & 6 deletions source/Character.hx
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,8 @@ class Character extends FlxSprite
noAntialiasing = true;
}

if(Std.string(json.health_drain).length > 0) {
healthDrain = json.health_drain;
} else healthDrain = false;

if(Std.string(json.shake_screen).length > 0) {
healthDrain = json.health_drain;
shakeScreen = json.shake_screen;
} else shakeScreen = false;

drainAmount = json.drain_amount;
drainFloor = json.drain_floor;
Expand Down
Loading

0 comments on commit 9893cec

Please sign in to comment.