Skip to content

Commit

Permalink
bruh?
Browse files Browse the repository at this point in the history
  • Loading branch information
MF42-DZH committed Apr 1, 2020
1 parent 69e356f commit 8a740d5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
12 changes: 12 additions & 0 deletions src/zeroxfc/nullpo/custom/modes/FireworkChallenge.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,15 @@ public class FireworkChallenge extends DummyMode {
"GLITCHYPSI, OSHISAURE, RY00001, AKARI, THE DRAGON GOD NERROTH.",
"YOU HAVE COMPLETED THE FIREWORK CHALLENGE!"
};

private static final int[] INPUT_SEQUENCE = {
Controller.BUTTON_DOWN, Controller.BUTTON_DOWN,
Controller.BUTTON_UP, Controller.BUTTON_UP,
Controller.BUTTON_RIGHT, Controller.BUTTON_LEFT,
Controller.BUTTON_RIGHT, Controller.BUTTON_LEFT,
};

private boolean[] presses;

// Staff roll object
private ScrollingMarqueeText creditObject;
Expand Down Expand Up @@ -258,6 +267,7 @@ public class FireworkChallenge extends DummyMode {
private int[] rankingFireworksPlayer, rankingLevelPlayer, rankingTimePlayer;

private boolean killed;
// TODO: debug mode meme

// Get mode name
@Override
Expand All @@ -268,6 +278,8 @@ public String getName() {
// Initialise everything.
@Override
public void playerInit(GameEngine engine, int playerID) {
presses = new boolean[] { false, false, false, false, false, false, false, false, false, false };

SoundLoader.loadSoundset(SoundLoader.LOADTYPE_FIREWORKS);

creditObject = new ScrollingMarqueeText(CREDIT_HEADINGS, CREDIT_TEXTS, EventReceiver.COLOR_ORANGE, EventReceiver.COLOR_WHITE);
Expand Down
3 changes: 2 additions & 1 deletion src/zeroxfc/nullpo/custom/modes/ShadowMarathon.java
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,8 @@ public void onLast(GameEngine engine, int playerID) {
}

if (engine.gameActive && (engine.stat == GameEngine.STAT_MOVE || engine.stat == GameEngine.STAT_ARE)) {
if (engine.ctrl.isPush(Controller.BUTTON_F) && onShadow && currentMaxMatchValue >= 0.75) {
// Sometimes engine.nowPieceObject is null?
if (engine.nowPieceObject != null && engine.ctrl.isPush(Controller.BUTTON_F) && onShadow && currentMaxMatchValue >= 0.75) {
fallPieceDraw = new Piece(engine.nowPieceObject);

int bX = receiver.getFieldDisplayPositionX(engine, playerID) + 4;
Expand Down

0 comments on commit 8a740d5

Please sign in to comment.