[nullpomino] r908 committed - More enums.

[nullp...@googlecode.com]

Revision: 908
Author: Pooch...@gmail.com
Date: Mon Nov 26 10:06:41 2012
Log: More enums.
http://code.google.com/p/nullpomino/source/detail?r=908

Modified:
/trunk/src/mu/nu/nullpo/game/component/Field.java
/trunk/src/mu/nu/nullpo/game/play/GameEngine.java
/trunk/src/mu/nu/nullpo/game/play/GameManager.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/Avalanche1PDummyMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDummyMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java

=======================================
--- /trunk/src/mu/nu/nullpo/game/component/Field.java Fri Feb 18 00:47:31
2011
+++ /trunk/src/mu/nu/nullpo/game/component/Field.java Mon Nov 26 10:06:41
2012
@@ -2104,9 +2104,9 @@
return total;
}

- public boolean doCascadeGravity(int type) {
+ public boolean doCascadeGravity(GameEngine.LineGravity type) {
setAllAttribute(Block.BLOCK_ATTRIBUTE_LAST_COMMIT, false);
- if (type == GameEngine.LINE_GRAVITY_CASCADE_SLOW)
+ if (type == GameEngine.LineGravity.CASCADE_SLOW)
return doCascadeSlow();
else
return doCascadeGravity();
=======================================
--- /trunk/src/mu/nu/nullpo/game/play/GameEngine.java Mon Nov 26 09:39:55
2012
+++ /trunk/src/mu/nu/nullpo/game/play/GameEngine.java Mon Nov 26 10:06:41
2012
@@ -76,13 +76,9 @@
public static final int MAX_STATC = 10;

/** Constants of last successful movements */
- public static final int LASTMOVE_NONE = 0,
- LASTMOVE_FALL_AUTO = 1,
- LASTMOVE_FALL_SELF = 2,
- LASTMOVE_SLIDE_AIR = 3,
- LASTMOVE_SLIDE_GROUND = 4,
- LASTMOVE_ROTATE_AIR = 5,
- LASTMOVE_ROTATE_GROUND = 6;
+ public enum LastMove {
+ NONE, FALL_AUTO, FALL_SELF, SLIDE_AIR, SLIDE_GROUND, ROTATE_AIR,
ROTATE_GROUND
+ }

/** Constants of block outline type */
public static final int BLOCK_OUTLINE_AUTO = -1,
@@ -122,10 +118,14 @@
INTERRUPTITEM_MIRROR = 1;

/** Line gravity types */
- public static final int LINE_GRAVITY_NATIVE = 0, LINE_GRAVITY_CASCADE =
1, LINE_GRAVITY_CASCADE_SLOW = 2;
+ public enum LineGravity {
+ NATIVE, CASCADE, CASCADE_SLOW
+ }

- /** Clear mode settings */
- public static final int CLEAR_LINE = 0, CLEAR_COLOR = 1, CLEAR_LINE_COLOR
= 2, CLEAR_GEM_COLOR = 3;
+ /** Clear mode settings */
+ public enum ClearType {
+ LINE, COLOR, LINE_COLOR, GEM_COLOR
+ }

/** Table for color-block item */
public static final int[] ITEM_COLOR_BRIGHT_TABLE =
@@ -298,7 +298,7 @@
public int lineClearing;

/** Line gravity type (Native, Cascade, etc) */
- public int lineGravityType;
+ public LineGravity lineGravityType;

/** Current number of chains */
public int chain;
@@ -379,7 +379,7 @@
public boolean manualLock;

/** Last successful movement */
- public int lastmove;
+ public LastMove lastmove;

/** ture if T-Spin */
public boolean tspin;
@@ -610,7 +610,7 @@
public int owBlockShowOutlineOnly;

/** Clear mode selection */
- public int clearMode;
+ public ClearType clearMode;

/** Size needed for a color-group clear */
public int colorClearSize;
@@ -776,7 +776,7 @@
holdUsedCount = 0;

lineClearing = 0;
- lineGravityType = LINE_GRAVITY_NATIVE;
+ lineGravityType = LineGravity.NATIVE;
chain = 0;
lineGravityTotalLines = 0;

@@ -812,7 +812,7 @@

manualLock = false;

- lastmove = LASTMOVE_NONE;
+ lastmove = LastMove.NONE;

tspin = false;
tspinmini = false;
@@ -906,7 +906,7 @@

interruptItemNumber = INTERRUPTITEM_NONE;

- clearMode = CLEAR_LINE;
+ clearMode = ClearType.LINE;
colorClearSize = -1;
garbageColorClear = false;
ignoreHidden = false;
@@ -2162,7 +2162,7 @@
nowWallkickCount = 0;
nowUpwardWallkickCount = 0;
lineClearing = 0;
- lastmove = LASTMOVE_NONE;
+ lastmove = LastMove.NONE;
kickused = false;
tspin = false;
tspinmini = false;
@@ -2295,9 +2295,9 @@

if(onGroundBeforeRotate) {
extendedRotateCount++;
- lastmove = LASTMOVE_ROTATE_GROUND;
+ lastmove = LastMove.ROTATE_GROUND;
} else {
- lastmove = LASTMOVE_ROTATE_AIR;
+ lastmove = LastMove.ROTATE_AIR;
}

if(initialRotateDirection == 0) {
@@ -2396,9 +2396,9 @@

if(onGroundBeforeMove) {
extendedMoveCount++;
- lastmove = LASTMOVE_SLIDE_GROUND;
+ lastmove = LastMove.SLIDE_GROUND;
} else {
- lastmove = LASTMOVE_SLIDE_AIR;
+ lastmove = LastMove.SLIDE_AIR;
}

if(!dasInstant) playSE("move");
@@ -2432,7 +2432,7 @@
if(owner.mode != null) owner.mode.afterHardDropFall(this, playerID,
harddropFall);
owner.receiver.afterHardDropFall(this, playerID, harddropFall);

- lastmove = LASTMOVE_FALL_SELF;
+ lastmove = LastMove.FALL_SELF;
if(ruleopt.lockresetFall == true) {
lockDelayNow = 0;
nowPieceObject.setDarkness(0f);
@@ -2496,18 +2496,18 @@
nowPieceObject.setDarkness(0f);
}

- if((lastmove != LASTMOVE_ROTATE_GROUND) && (lastmove !=
LASTMOVE_SLIDE_GROUND) && (lastmove != LASTMOVE_FALL_SELF)) {
+ if((lastmove != LastMove.ROTATE_GROUND) && (lastmove !=
LastMove.SLIDE_GROUND) && (lastmove != LastMove.FALL_SELF)) {
extendedMoveCount = 0;
extendedRotateCount = 0;
}

if(softdropUsed == true) {
- lastmove = LASTMOVE_FALL_SELF;
+ lastmove = LastMove.FALL_SELF;
softdropFall++;
softdropFallNow++;
playSE("softdrop");
} else {
- lastmove = LASTMOVE_FALL_AUTO;
+ lastmove = LastMove.FALL_AUTO;
}
} else {
break;
@@ -2603,7 +2603,7 @@
if(ruleopt.lockflash > 0) nowPieceObject.setDarkness(-0.8f);

// T-Spin判定
- if(((lastmove == LASTMOVE_ROTATE_GROUND) || (lastmove ==
LASTMOVE_ROTATE_AIR)) && (tspinEnable == true)) {
+ if(((lastmove == LastMove.ROTATE_GROUND) || (lastmove ==
LastMove.ROTATE_AIR)) && (tspinEnable == true)) {
if(useAllSpinBonus)
setAllSpin(nowPieceX, nowPieceY, nowPieceObject, field);
else
@@ -2621,13 +2621,13 @@

if((ending == 0) || (staffrollEnableStatistics))
statistics.totalPieceLocked++;

- if (clearMode == CLEAR_LINE)
+ if (clearMode == ClearType.LINE)
lineClearing = field.checkLineNoFlag();
- else if (clearMode == CLEAR_COLOR)
+ else if (clearMode == ClearType.COLOR)
lineClearing = field.checkColor(colorClearSize, false,
garbageColorClear, gemSameColor, ignoreHidden);
- else if (clearMode == CLEAR_LINE_COLOR)
+ else if (clearMode == ClearType.LINE_COLOR)
lineClearing = field.checkLineColor(colorClearSize, false,
lineColorDiagonals, gemSameColor);
- else if (clearMode == CLEAR_GEM_COLOR)
+ else if (clearMode == ClearType.GEM_COLOR)
lineClearing = field.gemColorCheck(colorClearSize, false,
garbageColorClear, ignoreHidden);
chain = 0;
lineGravityTotalLines = 0;
@@ -2665,7 +2665,7 @@
// 画面外に置いて死亡
stat = Status.GAMEOVER;
if((ending == 2) && (staffrollNoDeath)) stat = Status.NOTHING;
- } else if ((lineGravityType == LINE_GRAVITY_CASCADE ||
lineGravityType == LINE_GRAVITY_CASCADE_SLOW)
+ } else if ((lineGravityType == LineGravity.CASCADE || lineGravityType
== LineGravity.CASCADE_SLOW)
&& !connectBlocks) {
stat = Status.LINECLEAR;
statc[0] = getLineDelay();
@@ -2766,15 +2766,15 @@
if (sticky == 2)
field.setAllAttribute(Block.BLOCK_ATTRIBUTE_IGNORE_BLOCKLINK, true);
// Line clear flagを設定
- if (clearMode == CLEAR_LINE)
+ if (clearMode == ClearType.LINE)
lineClearing = field.checkLine();
// Set color clear flags
- else if (clearMode == CLEAR_COLOR)
+ else if (clearMode == ClearType.COLOR)
lineClearing = field.checkColor(colorClearSize, true,
garbageColorClear, gemSameColor, ignoreHidden);
// Set line color clear flags
- else if (clearMode == CLEAR_LINE_COLOR)
+ else if (clearMode == ClearType.LINE_COLOR)
lineClearing = field.checkLineColor(colorClearSize, true,
lineColorDiagonals, gemSameColor);
- else if (clearMode == CLEAR_GEM_COLOR)
+ else if (clearMode == ClearType.GEM_COLOR)
lineClearing = field.gemColorCheck(colorClearSize, true,
garbageColorClear, ignoreHidden);

// Linescountを決める
@@ -2794,7 +2794,7 @@
if(li == 3) statistics.totalTSpinTriple++;
}
} else {
- if (clearMode == CLEAR_LINE)
+ if (clearMode == ClearType.LINE)
playSE("erase" + li);

if((ending == 0) || (staffrollEnableStatistics)) {
@@ -2855,7 +2855,7 @@
owner.receiver.calcScore(this, playerID, li);

// Blockを消す演出を出す (まだ実際には消えていない）
- if (clearMode == CLEAR_LINE) {
+ if (clearMode == ClearType.LINE) {
for(int i = 0; i < field.getHeight(); i++) {
if(field.getLineFlag(i)) {
for(int j = 0; j < field.getWidth(); j++) {
@@ -2868,7 +2868,7 @@
}
}
}
- } else if (clearMode == CLEAR_LINE_COLOR || clearMode == CLEAR_COLOR ||
clearMode == CLEAR_GEM_COLOR)
+ } else if (clearMode == ClearType.LINE_COLOR || clearMode ==
ClearType.COLOR || clearMode == ClearType.GEM_COLOR)
for(int i = 0; i < field.getHeight(); i++) {
for(int j = 0; j < field.getWidth(); j++) {
Block blk = field.getBlock(j, i);
@@ -2890,18 +2890,18 @@
}

// Blockを消す
- if (clearMode == CLEAR_LINE)
+ if (clearMode == ClearType.LINE)
field.clearLine();
- else if (clearMode == CLEAR_COLOR)
+ else if (clearMode == ClearType.COLOR)
field.clearColor(colorClearSize, garbageColorClear, gemSameColor,
ignoreHidden);
- else if (clearMode == CLEAR_LINE_COLOR)
+ else if (clearMode == ClearType.LINE_COLOR)
field.clearLineColor(colorClearSize, lineColorDiagonals, gemSameColor);
- else if (clearMode == CLEAR_GEM_COLOR)
+ else if (clearMode == ClearType.GEM_COLOR)
lineClearing = field.gemClearColor(colorClearSize, garbageColorClear,
ignoreHidden);
}

// Linesを1段落とす
- if((lineGravityType == LINE_GRAVITY_NATIVE) &&
+ if((lineGravityType == LineGravity.NATIVE) &&
(getLineDelay() >= (lineClearing - 1)) && (statc[0] >= getLineDelay()
- (lineClearing - 1)) && (ruleopt.lineFallAnim))
{
field.downFloatingBlocksSingleLine();
@@ -2927,7 +2927,7 @@
// Next ステータス
if(statc[0] >= getLineDelay()) {
// Cascade
- if((lineGravityType == LINE_GRAVITY_CASCADE || lineGravityType ==
LINE_GRAVITY_CASCADE_SLOW)) {
+ if((lineGravityType == LineGravity.CASCADE || lineGravityType ==
LineGravity.CASCADE_SLOW)) {
if (statc[6] < getCascadeDelay()) {
statc[6]++;
return;
@@ -2939,10 +2939,10 @@
field.setBlockLinkByColor();
statc[6]++;
return;
- } else if(((clearMode == CLEAR_LINE) && field.checkLineNoFlag() > 0) ||
- ((clearMode == CLEAR_COLOR) && field.checkColor(colorClearSize,
false, garbageColorClear, gemSameColor, ignoreHidden) > 0) ||
- ((clearMode == CLEAR_LINE_COLOR) &&
field.checkLineColor(colorClearSize, false, lineColorDiagonals,
gemSameColor) > 0) ||
- ((clearMode == CLEAR_GEM_COLOR) &&
field.gemColorCheck(colorClearSize, false, garbageColorClear, ignoreHidden)
> 0)) {
+ } else if(((clearMode == ClearType.LINE) && field.checkLineNoFlag() >
0) ||
+ ((clearMode == ClearType.COLOR) && field.checkColor(colorClearSize,
false, garbageColorClear, gemSameColor, ignoreHidden) > 0) ||
+ ((clearMode == ClearType.LINE_COLOR) &&
field.checkLineColor(colorClearSize, false, lineColorDiagonals,
gemSameColor) > 0) ||
+ ((clearMode == ClearType.GEM_COLOR) &&
field.gemColorCheck(colorClearSize, false, garbageColorClear, ignoreHidden)
> 0)) {
tspin = false;
tspinmini = false;
chain++;
@@ -2962,7 +2962,7 @@
field.setAllAttribute(Block.BLOCK_ATTRIBUTE_IGNORE_BLOCKLINK, true);

if(!skip) {
- if(lineGravityType == LINE_GRAVITY_NATIVE) field.downFloatingBlocks();
+ if(lineGravityType == LineGravity.NATIVE) field.downFloatingBlocks();
playSE("linefall");

field.lineColorsCleared = null;
=======================================
--- /trunk/src/mu/nu/nullpo/game/play/GameManager.java Mon Nov 26 09:39:55
2012
+++ /trunk/src/mu/nu/nullpo/game/play/GameManager.java Mon Nov 26 10:06:41
2012
@@ -31,7 +31,6 @@
import mu.nu.nullpo.game.component.BGMStatus;
import mu.nu.nullpo.game.component.BackgroundStatus;
import mu.nu.nullpo.game.event.EventReceiver;
-import mu.nu.nullpo.game.play.GameEngine.Status;
import mu.nu.nullpo.game.subsystem.mode.GameMode;
import mu.nu.nullpo.util.CustomProperties;

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/Avalanche1PDummyMode.java
Sat Nov 10 01:54:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/Avalanche1PDummyMode.java
Mon Nov 26 10:06:41 2012
@@ -186,7 +186,7 @@
toNextLevel = blocksPerLevel;

engine.framecolor = GameEngine.FRAME_COLOR_PURPLE;
- engine.clearMode = GameEngine.CLEAR_COLOR;
+ engine.clearMode = GameEngine.ClearType.COLOR;
engine.garbageColorClear = true;
engine.colorClearSize = 4;
engine.ignoreHidden = true;
@@ -230,7 +230,7 @@

protected boolean readyInit(GameEngine engine, int playerID) {
engine.numColors = numColors;
- engine.lineGravityType = cascadeSlow ?
GameEngine.LINE_GRAVITY_CASCADE_SLOW : GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = cascadeSlow ?
GameEngine.LineGravity.CASCADE_SLOW : GameEngine.LineGravity.CASCADE;
engine.displaysize = bigDisplay ? 1 : 0;

if(outlinetype == 0) engine.blockOutlineType =
GameEngine.BLOCK_OUTLINE_NORMAL;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Mon Nov 26 09:39:55 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Mon Nov 26 10:06:41 2012
@@ -386,7 +386,7 @@
public boolean onReady(GameEngine engine, int playerID) {
if(engine.statc[0] == 0) {
engine.numColors = numColors[playerID];
- engine.lineGravityType = cascadeSlow[playerID] ?
GameEngine.LINE_GRAVITY_CASCADE_SLOW : GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = cascadeSlow[playerID] ?
GameEngine.LineGravity.CASCADE_SLOW : GameEngine.LineGravity.CASCADE;
engine.rainbowAnimate = true;
engine.displaysize = bigDisplay ? 1 : 0;

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDummyMode.java
Mon Nov 26 09:39:55 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDummyMode.java
Mon Nov 26 10:06:41 2012
@@ -485,9 +485,9 @@
}

engine.framecolor = PLAYER_COLOR_FRAME[playerID];
- engine.clearMode = GameEngine.CLEAR_COLOR;
+ engine.clearMode = GameEngine.ClearType.COLOR;
engine.garbageColorClear = true;
- engine.lineGravityType = GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = GameEngine.LineGravity.CASCADE;
for(int i = 0; i < Piece.PIECE_COUNT; i++)
engine.nextPieceEnable[i] = (PIECE_ENABLE[i] == 1);
engine.blockColors = BLOCK_COLORS;
@@ -519,7 +519,7 @@

public boolean readyInit(GameEngine engine, int playerID) {
engine.numColors = numColors[playerID];
- engine.lineGravityType = cascadeSlow[playerID] ?
GameEngine.LINE_GRAVITY_CASCADE_SLOW : GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = cascadeSlow[playerID] ?
GameEngine.LineGravity.CASCADE_SLOW : GameEngine.LineGravity.CASCADE;
engine.displaysize = bigDisplay ? 1 : 0;
engine.sticky = 2;

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Mon Nov
26 09:39:55 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Mon Nov
26 10:06:41 2012
@@ -147,10 +147,10 @@
}

engine.framecolor = GameEngine.FRAME_COLOR_PURPLE;
- engine.clearMode = GameEngine.CLEAR_LINE_COLOR;
+ engine.clearMode = GameEngine.ClearType.LINE_COLOR;
engine.garbageColorClear = false;
engine.colorClearSize = 4;
- engine.lineGravityType = GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = GameEngine.LineGravity.CASCADE;
for(int i = 0; i < Piece.PIECE_COUNT; i++)
engine.nextPieceEnable[i] = (PIECE_ENABLE[i] == 1);
engine.randomBlockColor = true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java Mon
Nov 26 09:39:55 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java Mon
Nov 26 10:06:41 2012
@@ -354,10 +354,10 @@
}

engine.framecolor = PLAYER_COLOR_FRAME[playerID];
- engine.clearMode = GameEngine.CLEAR_LINE_COLOR;
+ engine.clearMode = GameEngine.ClearType.LINE_COLOR;
engine.garbageColorClear = false;
engine.colorClearSize = 4;
- engine.lineGravityType = GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = GameEngine.LineGravity.CASCADE;
for(int i = 0; i < Piece.PIECE_COUNT; i++)
engine.nextPieceEnable[i] = (PIECE_ENABLE[i] == 1);
engine.randomBlockColor = true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java Mon Nov 26
09:39:55 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java Mon Nov 26
10:06:41 2012
@@ -526,9 +526,9 @@
}

engine.framecolor = PLAYER_COLOR_FRAME[playerID];
- engine.clearMode = GameEngine.CLEAR_GEM_COLOR;
+ engine.clearMode = GameEngine.ClearType.GEM_COLOR;
engine.garbageColorClear = true;
- engine.lineGravityType = GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = GameEngine.LineGravity.CASCADE;
for(int i = 0; i < Piece.PIECE_COUNT; i++)
engine.nextPieceEnable[i] = (PIECE_ENABLE[i] == 1);
engine.blockColors = BLOCK_COLORS;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Mon Nov 26
09:39:55 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Mon Nov 26
10:06:41 2012
@@ -299,7 +299,7 @@
@Override
public boolean onMove(GameEngine engine, int playerID) {
// Disable cascade
- engine.lineGravityType = GameEngine.LINE_GRAVITY_NATIVE;
+ engine.lineGravityType = GameEngine.LineGravity.NATIVE;
return false;
}

@@ -466,7 +466,7 @@
int pts = lines;

if (lines > 0) {
- engine.lineGravityType = GameEngine.LINE_GRAVITY_NATIVE;
+ engine.lineGravityType = GameEngine.LineGravity.NATIVE;
if (engine.field.isEmpty()) {
engine.playSE("bravo");
}
@@ -551,7 +551,7 @@
for (int y = (-1 * hiddenHeight); y < height; y++)
engine.field.setLineFlag(y, false);
// Set cascade flag
- engine.lineGravityType = GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = GameEngine.LineGravity.CASCADE;
}

/**
@@ -605,7 +605,7 @@
}

// Set cascade flag
- engine.lineGravityType = GameEngine.LINE_GRAVITY_CASCADE;
+ engine.lineGravityType = GameEngine.LineGravity.CASCADE;
}

/*
@@ -613,7 +613,7 @@
*/
@Override
public boolean lineClearEnd(GameEngine engine, int playerID) {
- if((engine.lineGravityType == GameEngine.LINE_GRAVITY_CASCADE) &&
(engine.lineGravityTotalLines > 0) && (tntAvalanche)) {
+ if((engine.lineGravityType == GameEngine.LineGravity.CASCADE) &&
(engine.lineGravityTotalLines > 0) && (tntAvalanche)) {
Field field = engine.field;
for(int i = field.getHeightWithoutHurryupFloor() - 1; i >=
(field.getHiddenHeight() * -1); i--) {
if(field.isEmptyLine(i)) {