[nullpomino] r907 committed - Use enum for engine's stat field

[nullp...@googlecode.com]

Revision: 907
Author: Pooch...@gmail.com
Date: Mon Nov 26 09:39:55 2012
Log: Use enum for engine's stat field
http://code.google.com/p/nullpomino/source/detail?r=907

Modified:
/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/ai/BasicAI.java
/trunk/src/mu/nu/nullpo/game/subsystem/ai/RanksAI.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AbstractMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.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/AvalancheVSFeverMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GemManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/LegacyNetVSBattleMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/LineRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyVSMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSBattleMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSDigRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSLineRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.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/PracticeMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMasteryMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/VSBattleMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/VSDigRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/VSLineRaceMode.java
/trunk/src/net/tetrisconcept/poochy/nullpomino/ai/ComboRaceBot.java
/trunk/src/net/tetrisconcept/poochy/nullpomino/ai/Nohoho.java
/trunk/src/net/tetrisconcept/poochy/nullpomino/ai/PoochyBot.java

=======================================
--- /trunk/src/mu/nu/nullpo/game/play/GameEngine.java Sun Mar 4 19:18:39
2012
+++ /trunk/src/mu/nu/nullpo/game/play/GameEngine.java Mon Nov 26 09:39:55
2012
@@ -68,20 +68,9 @@
public static final String[] GAMESTYLE_NAMES =
{"TETROMINO", "AVALANCHE", "PHYSICIAN", "SPF"};

/** Constants of main game status */
- public static final int STAT_NOTHING = -1,
- STAT_SETTING = 0,
- STAT_READY = 1,
- STAT_MOVE = 2,
- STAT_LOCKFLASH = 3,
- STAT_LINECLEAR = 4,
- STAT_ARE = 5,
- STAT_ENDINGSTART = 6,
- STAT_CUSTOM = 7,
- STAT_EXCELLENT = 8,
- STAT_GAMEOVER = 9,
- STAT_RESULT = 10,
- STAT_FIELDEDIT = 11,
- STAT_INTERRUPTITEM = 12;
+ public static enum Status {
+ NOTHING, SETTING, READY, MOVE, LOCKFLASH, LINECLEAR, ARE, ENDINGSTART,
CUSTOM, EXCELLENT, GAMEOVER, RESULT, FIELDEDIT, INTERRUPTITEM
+ };

/** Number of free status counters (used by statc array) */
public static final int MAX_STATC = 10;
@@ -225,7 +214,7 @@
public boolean aiHintReady;

/** Current main game status */
- public int stat;
+ public Status stat;

/** Free status counters */
public int[] statc;
@@ -558,7 +547,7 @@
public int fldeditColor;

/** Field edit screen: Previous game status number */
- public int fldeditPreviousStat;
+ public Status fldeditPreviousStat;

/** Field edit screen: Frame counter */
public int fldeditFrames;
@@ -591,7 +580,7 @@
public int interruptItemNumber;

/** Post-status of interruptable item */
- public int interruptItemPreviousStat;
+ public Status interruptItemPreviousStat;

/** Backup field for Mirror item */
public Field interruptItemMirrorField;
@@ -760,7 +749,7 @@

quitflag = false;

- stat = STAT_SETTING;
+ stat = Status.SETTING;
statc = new int[MAX_STATC];

isInGame = false;
@@ -1665,7 +1654,7 @@
*/
public void enterFieldEdit() {
fldeditPreviousStat = stat;
- stat = STAT_FIELDEDIT;
+ stat = Status.FIELDEDIT;
fldeditX = 0;
fldeditY = 0;
fldeditColor = Block.BLOCK_COLOR_GRAY;
@@ -1752,49 +1741,49 @@
// 各ステータスの処理
if(!lagStop) {
switch(stat) {
- case STAT_NOTHING:
+ case NOTHING:
break;
- case STAT_SETTING:
+ case SETTING:
statSetting();
break;
- case STAT_READY:
+ case READY:
statReady();
break;
- case STAT_MOVE:
+ case MOVE:
dasRepeat = true;
dasInstant = false;
while(dasRepeat){
statMove();
}
break;
- case STAT_LOCKFLASH:
+ case LOCKFLASH:
statLockFlash();
break;
- case STAT_LINECLEAR:
+ case LINECLEAR:
statLineClear();
break;
- case STAT_ARE:
+ case ARE:
statARE();
break;
- case STAT_ENDINGSTART:
+ case ENDINGSTART:
statEndingStart();
break;
- case STAT_CUSTOM:
+ case CUSTOM:
statCustom();
break;
- case STAT_EXCELLENT:
+ case EXCELLENT:
statExcellent();
break;
- case STAT_GAMEOVER:
+ case GAMEOVER:
statGameOver();
break;
- case STAT_RESULT:
+ case RESULT:
statResult();
break;
- case STAT_FIELDEDIT:
+ case FIELDEDIT:
statFieldEdit();
break;
- case STAT_INTERRUPTITEM:
+ case INTERRUPTITEM:
statInterruptItem();
break;
}
@@ -1835,57 +1824,57 @@

// 各ステータスの処理
switch(stat) {
- case STAT_NOTHING:
+ case NOTHING:
break;
- case STAT_SETTING:
+ case SETTING:
if(owner.mode != null) owner.mode.renderSetting(this, playerID);
owner.receiver.renderSetting(this, playerID);
break;
- case STAT_READY:
+ case READY:
if(owner.mode != null) owner.mode.renderReady(this, playerID);
owner.receiver.renderReady(this, playerID);
break;
- case STAT_MOVE:
+ case MOVE:
if(owner.mode != null) owner.mode.renderMove(this, playerID);
owner.receiver.renderMove(this, playerID);
break;
- case STAT_LOCKFLASH:
+ case LOCKFLASH:
if(owner.mode != null) owner.mode.renderLockFlash(this, playerID);
owner.receiver.renderLockFlash(this, playerID);
break;
- case STAT_LINECLEAR:
+ case LINECLEAR:
if(owner.mode != null) owner.mode.renderLineClear(this, playerID);
owner.receiver.renderLineClear(this, playerID);
break;
- case STAT_ARE:
+ case ARE:
if(owner.mode != null) owner.mode.renderARE(this, playerID);
owner.receiver.renderARE(this, playerID);
break;
- case STAT_ENDINGSTART:
+ case ENDINGSTART:
if(owner.mode != null) owner.mode.renderEndingStart(this, playerID);
owner.receiver.renderEndingStart(this, playerID);
break;
- case STAT_CUSTOM:
+ case CUSTOM:
if(owner.mode != null) owner.mode.renderCustom(this, playerID);
owner.receiver.renderCustom(this, playerID);
break;
- case STAT_EXCELLENT:
+ case EXCELLENT:
if(owner.mode != null) owner.mode.renderExcellent(this, playerID);
owner.receiver.renderExcellent(this, playerID);
break;
- case STAT_GAMEOVER:
+ case GAMEOVER:
if(owner.mode != null) owner.mode.renderGameOver(this, playerID);
owner.receiver.renderGameOver(this, playerID);
break;
- case STAT_RESULT:
+ case RESULT:
if(owner.mode != null) owner.mode.renderResult(this, playerID);
owner.receiver.renderResult(this, playerID);
break;
- case STAT_FIELDEDIT:
+ case FIELDEDIT:
if(owner.mode != null) owner.mode.renderFieldEdit(this, playerID);
owner.receiver.renderFieldEdit(this, playerID);
break;
- case STAT_INTERRUPTITEM:
+ case INTERRUPTITEM:
break;
}

@@ -1918,7 +1907,7 @@
owner.receiver.onSetting(this, playerID);

// Mode側が何もしない場合はReady画面へ移動
- stat = STAT_READY;
+ stat = Status.READY;
resetStatc();
}

@@ -2029,7 +2018,7 @@
if(owner.mode != null) owner.mode.startGame(this, playerID);
owner.receiver.startGame(this, playerID);
initialRotate();
- stat = STAT_MOVE;
+ stat = Status.MOVE;
resetStatc();
if(!readyDone) {
startTime = System.nanoTime();
@@ -2342,8 +2331,8 @@
if(nowPieceObject.checkCollision(nowPieceX, nowPieceY, field) == true)
{
nowPieceObject.placeToField(nowPieceX, nowPieceY, field);
nowPieceObject = null;
- stat = STAT_GAMEOVER;
- if((ending == 2) && (staffrollNoDeath)) stat = STAT_NOTHING;
+ stat = Status.GAMEOVER;
+ if((ending == 2) && (staffrollNoDeath)) stat = Status.NOTHING;
resetStatc();
return;
}
@@ -2666,42 +2655,42 @@
dasInstant = false;

// Next 処理を決める(Mode 側でステータスを弄っている場合は何もしない)
- if((stat == STAT_MOVE) || (versionMajor <= 6.3f)) {
+ if((stat == Status.MOVE) || (versionMajor <= 6.3f)) {
resetStatc();

if((ending == 1) && (versionMajor >= 6.6f) && (versionMinorOld >=
0.1f)) {
// Ending
- stat = STAT_ENDINGSTART;
+ stat = Status.ENDINGSTART;
} else if( (!put && ruleopt.fieldLockoutDeath) || (partialLockOut &&
ruleopt.fieldPartialLockoutDeath) ) {
// 画面外に置いて死亡
- stat = STAT_GAMEOVER;
- if((ending == 2) && (staffrollNoDeath)) stat = STAT_NOTHING;
+ stat = Status.GAMEOVER;
+ if((ending == 2) && (staffrollNoDeath)) stat = Status.NOTHING;
} else if ((lineGravityType == LINE_GRAVITY_CASCADE ||
lineGravityType == LINE_GRAVITY_CASCADE_SLOW)
&& !connectBlocks) {
- stat = STAT_LINECLEAR;
+ stat = Status.LINECLEAR;
statc[0] = getLineDelay();
statLineClear();
} else if( (lineClearing > 0) && ((ruleopt.lockflash <= 0) ||
(!ruleopt.lockflashBeforeLineClear)) ) {
// Line clear
- stat = STAT_LINECLEAR;
+ stat = Status.LINECLEAR;
statLineClear();
} else if( ((getARE() > 0) || (lagARE) ||
(ruleopt.lockflashBeforeLineClear)) &&
(ruleopt.lockflash > 0) && (ruleopt.lockflashOnlyFrame) )
{
// AREあり (光あり）
- stat = STAT_LOCKFLASH;
+ stat = Status.LOCKFLASH;
} else if((getARE() > 0) || (lagARE)) {
// AREあり (光なし）
statc[1] = getARE();
- stat = STAT_ARE;
+ stat = Status.ARE;
} else if(interruptItemNumber != INTERRUPTITEM_NONE) {
// 中断効果のあるアイテム処理
nowPieceObject = null;
- interruptItemPreviousStat = STAT_MOVE;
- stat = STAT_INTERRUPTITEM;
+ interruptItemPreviousStat = Status.MOVE;
+ stat = Status.INTERRUPTITEM;
} else {
// AREなし
- stat = STAT_MOVE;
+ stat = Status.MOVE;
if(ruleopt.moveFirstFrame == false) statMove();
}
}
@@ -2743,12 +2732,12 @@

if(lineClearing > 0) {
// Line clear
- stat = STAT_LINECLEAR;
+ stat = Status.LINECLEAR;
statLineClear();
} else {
// ARE
statc[1] = getARE();
- stat = STAT_ARE;
+ stat = Status.ARE;
}
return;
}
@@ -2978,27 +2967,27 @@

field.lineColorsCleared = null;

- if((stat == STAT_LINECLEAR) || (versionMajor <= 6.3f)) {
+ if((stat == Status.LINECLEAR) || (versionMajor <= 6.3f)) {
resetStatc();
if(ending == 1) {
// Ending
- stat = STAT_ENDINGSTART;
+ stat = Status.ENDINGSTART;
} else if((getARELine() > 0) || (lagARE)) {
// AREあり
statc[0] = 0;
statc[1] = getARELine();
statc[2] = 1;
- stat = STAT_ARE;
+ stat = Status.ARE;
} else if(interruptItemNumber != INTERRUPTITEM_NONE) {
// 中断効果のあるアイテム処理
nowPieceObject = null;
- interruptItemPreviousStat = STAT_MOVE;
- stat = STAT_INTERRUPTITEM;
+ interruptItemPreviousStat = Status.MOVE;
+ stat = Status.INTERRUPTITEM;
} else {
// AREなし
nowPieceObject = null;
if(versionMajor < 7.5f) initialRotate(); //XXX: Weird IRS thing on
lines cleared but no ARE
- stat = STAT_MOVE;
+ stat = Status.MOVE;
}
}
}
@@ -3060,12 +3049,12 @@

if(interruptItemNumber != INTERRUPTITEM_NONE) {
// 中断効果のあるアイテム処理
- interruptItemPreviousStat = STAT_MOVE;
- stat = STAT_INTERRUPTITEM;
+ interruptItemPreviousStat = Status.MOVE;
+ stat = Status.INTERRUPTITEM;
} else {
// Blockピース移動処理
initialRotate();
- stat = STAT_MOVE;
+ stat = Status.MOVE;
}
}
}
@@ -3121,9 +3110,9 @@

if(staffrollEnable) {
nowPieceObject = null;
- stat = STAT_MOVE;
+ stat = Status.MOVE;
} else {
- stat = STAT_EXCELLENT;
+ stat = Status.EXCELLENT;
}
}
}
@@ -3164,7 +3153,7 @@

if((statc[0] >= 600) && (statc[1] == 0)) {
resetStatc();
- stat = STAT_GAMEOVER;
+ stat = Status.GAMEOVER;
} else {
statc[0]++;
}
@@ -3230,7 +3219,7 @@
owner.engine[i].field.reset();
}
owner.engine[i].resetStatc();
- owner.engine[i].stat = STAT_RESULT;
+ owner.engine[i].stat = Status.RESULT;
}
}
}
@@ -3260,7 +3249,7 @@
} else {
lives--;
resetStatc();
- stat = STAT_MOVE;
+ stat = Status.MOVE;
}
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/play/GameManager.java Mon Feb 28 13:32:16
2011
+++ /trunk/src/mu/nu/nullpo/game/play/GameManager.java Mon Nov 26 09:39:55
2012
@@ -31,6 +31,7 @@
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;

@@ -274,7 +275,7 @@
if(engine.length < 2) return -1;

for(int i = 0; i < engine.length; i++) {
- if(engine[i].stat != GameEngine.STAT_GAMEOVER) {
+ if(engine[i].stat != GameEngine.Status.GAMEOVER) {
return i;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/ai/BasicAI.java Sat Sep 11
10:39:11 2010
+++ /trunk/src/mu/nu/nullpo/game/subsystem/ai/BasicAI.java Mon Nov 26
09:39:55 2012
@@ -154,7 +154,7 @@
*/
@Override
public void setControl(GameEngine engine, int playerID, Controller ctrl) {
- if( (engine.nowPieceObject != null) && (engine.stat ==
GameEngine.STAT_MOVE) && (delay >= engine.aiMoveDelay) && (engine.statc[0]
> 0) &&
+ if( (engine.nowPieceObject != null) && (engine.stat ==
GameEngine.Status.MOVE) && (delay >= engine.aiMoveDelay) &&
(engine.statc[0] > 0) &&
(!engine.aiUseThread || (threadRunning && !thinking &&
(thinkCurrentPieceNo <= thinkLastPieceNo))) )
{
int input = 0; // button input data
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/ai/RanksAI.java Sun Jul 10
02:14:24 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/ai/RanksAI.java Mon Nov 26
09:39:55 2012
@@ -290,7 +290,7 @@
@Override
public void setControl(GameEngine engine, int playerID, Controller ctrl) {

- if( (engine.nowPieceObject != null) && (engine.stat ==
GameEngine.STAT_MOVE) && (delay >= engine.aiMoveDelay) && (engine.statc[0]
> 0) &&
+ if( (engine.nowPieceObject != null) && (engine.stat ==
GameEngine.Status.MOVE) && (delay >= engine.aiMoveDelay) &&
(engine.statc[0] > 0) &&
(!engine.aiUseThread || (threadRunning && !thinking &&
(thinkCurrentPieceNo <= thinkLastPieceNo))) )
{
int totalPieceLocked=engine.statistics.totalPieceLocked+1;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AbstractMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AbstractMode.java Mon Nov
26 09:39:55 2012
@@ -45,11 +45,11 @@
public abstract class AbstractMode implements GameMode {

/** Total score */
- protected static final int STAT_SCORE = 1, STAT_LINES = 2, STAT_TIME = 3,
- STAT_LEVEL = 4, STAT_LEVEL_MANIA = 5, STAT_PIECE = 6,
- STAT_MAXCOMBO = 7, STAT_SPL = 8, STAT_SPM = 9, STAT_SPS = 10,
- STAT_LPM = 11, STAT_LPS = 12, STAT_PPM = 13, STAT_PPS = 14,
- STAT_MAXCHAIN = 15, STAT_LEVEL_ADD_DISP = 16;
+ protected static enum Statistic { SCORE, LINES, TIME,
+ LEVEL, LEVEL_MANIA, PIECE,
+ MAXCOMBO, SPL, SPM, SPS,
+ LPM, LPS, PPM, PPS,
+ MAXCHAIN, LEVEL_ADD_DISP};

/** GameManager that owns this mode */
protected GameManager owner;
@@ -414,74 +414,74 @@
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10d",
rank + 1), scale);
}
}
- protected void drawResultStats (GameEngine engine, int playerID,
EventReceiver receiver, int y, int color, int... stats) {
+ protected void drawResultStats (GameEngine engine, int playerID,
EventReceiver receiver, int y, int color, Statistic ... stats) {
drawResultStatsScale(engine, playerID, receiver, y, color, 1.0f, stats);
}
- protected void drawResultStatsScale (GameEngine engine, int playerID,
EventReceiver receiver, int y, int color, float scale, int... stats) {
+ protected void drawResultStatsScale (GameEngine engine, int playerID,
EventReceiver receiver, int y, int color, float scale, Statistic ... stats)
{
for (int i = 0; i < stats.length; i++)
{
switch(stats[i]) {
- case STAT_SCORE:
+ case SCORE:
receiver.drawMenuFont(engine, playerID, 0, y, "SCORE", color, scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10d",
engine.statistics.score), scale);
break;
- case STAT_LINES:
+ case LINES:
receiver.drawMenuFont(engine, playerID, 0, y, "LINES", color, scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10d",
engine.statistics.lines), scale);
break;
- case STAT_TIME:
+ case TIME:
receiver.drawMenuFont(engine, playerID, 0, y, "TIME", color, scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10s",
GeneralUtil.getTime(engine.statistics.time)), scale);
break;
- case STAT_LEVEL:
+ case LEVEL:
receiver.drawMenuFont(engine, playerID, 0, y, "LEVEL", color, scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10d",
engine.statistics.level + 1), scale);
break;
- case STAT_LEVEL_MANIA:
+ case LEVEL_MANIA:
receiver.drawMenuFont(engine, playerID, 0, y, "LEVEL", color, scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10d",
engine.statistics.level), scale);
break;
- case STAT_PIECE:
+ case PIECE:
receiver.drawMenuFont(engine, playerID, 0, y, "PIECE", color, scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10d",
engine.statistics.totalPieceLocked), scale);
break;
- case STAT_MAXCOMBO:
+ case MAXCOMBO:
receiver.drawMenuFont(engine, playerID, 0, y, "MAX COMBO", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10d",
engine.statistics.maxCombo - 1), scale);
break;
- case STAT_SPL:
+ case SPL:
receiver.drawMenuFont(engine, playerID, 0, y, "SCORE/LINE", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10g",
engine.statistics.spl), scale);
break;
- case STAT_SPM:
+ case SPM:
receiver.drawMenuFont(engine, playerID, 0, y, "SCORE/MIN", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10g",
engine.statistics.spm), scale);
break;
- case STAT_SPS:
+ case SPS:
receiver.drawMenuFont(engine, playerID, 0, y, "SCORE/SEC", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10g",
engine.statistics.sps), scale);
break;
- case STAT_LPM:
+ case LPM:
receiver.drawMenuFont(engine, playerID, 0, y, "LINE/MIN", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10g",
engine.statistics.lpm), scale);
break;
- case STAT_LPS:
+ case LPS:
receiver.drawMenuFont(engine, playerID, 0, y, "LINE/SEC", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10g",
engine.statistics.lps), scale);
break;
- case STAT_PPM:
+ case PPM:
receiver.drawMenuFont(engine, playerID, 0, y, "PIECE/MIN", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10g",
engine.statistics.ppm), scale);
break;
- case STAT_PPS:
+ case PPS:
receiver.drawMenuFont(engine, playerID, 0, y, "PIECE/SEC", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10g",
engine.statistics.pps), scale);
break;
- case STAT_MAXCHAIN:
+ case MAXCHAIN:
receiver.drawMenuFont(engine, playerID, 0, y, "MAX CHAIN", color,
scale);
receiver.drawMenuFont(engine, playerID, 0, y+1, String.format("%10d",
engine.statistics.maxChain), scale);
break;
- case STAT_LEVEL_ADD_DISP:
+ case LEVEL_ADD_DISP:
receiver.drawMenuFont(engine, playerID, 0, y, "LEVEL", color, scale);
receiver.drawMenuFont(engine,
playerID,0,y+1,String.format("%10d",engine.statistics.level+engine.statistics.levelDispAdd),scale);
break;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java Mon
Nov 26 09:39:55 2012
@@ -365,7 +365,7 @@
receiver.drawScoreFont(engine, playerID, 0, 1, "(" +
FEVER_MAPS[mapSet].toUpperCase() + " " +
numColors + " COLORS)", EventReceiver.COLOR_DARKBLUE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (engine.ai == null)) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 6 : 4;
@@ -419,7 +419,7 @@
receiver.drawScoreFont(engine, playerID, 11, 18, "CLEARED",
EventReceiver.COLOR_BLUE);
receiver.drawScoreFont(engine, playerID, 11, 19,
String.valueOf(blocksCleared));

- if(engine.gameStarted && (engine.stat != GameEngine.STAT_MOVE) &&
(engine.stat != GameEngine.STAT_RESULT)) {
+ if(engine.gameStarted && (engine.stat != GameEngine.Status.MOVE) &&
(engine.stat != GameEngine.Status.RESULT)) {
drawXorTimer(engine, playerID);
}

@@ -512,7 +512,7 @@
if(timeLimit <= 300) engine.meterColor = GameEngine.METER_COLOR_RED;

if (!fastinuse && engine.ctrl.isPress(Controller.BUTTON_F) &&
- ((fastenable == 2) || (engine.stat == GameEngine.STAT_LINECLEAR &&
fastenable == 1))) {
+ ((fastenable == 2) || (engine.stat == GameEngine.Status.LINECLEAR &&
fastenable == 1))) {
fastinuse = true;
for (int i = 0; i < 4; i++) engine.owner.updateAll();
fastinuse = false;
@@ -585,7 +585,7 @@
{
if (!engine.field.getBlockEmpty(2, 0) || !engine.field.getBlockEmpty(3,
0))
{
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
engine.gameEnded();
engine.resetStatc();
engine.statc[1] = 1;
@@ -596,7 +596,7 @@
if((timeLimit <= 0) && (engine.timerActive == true)) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
}
return false;
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java Mon Nov
26 09:39:55 2012
@@ -312,7 +312,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "AVALANCHE (" + modeStr
+ ")", EventReceiver.COLOR_DARKBLUE);
receiver.drawScoreFont(engine, playerID, 0,
1, "("+SCORETYPE_NAME[scoreType] + " " + numColors + " COLORS)",
EventReceiver.COLOR_DARKBLUE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (engine.ai == null) &&
(engine.colorClearSize == 4)) {
float scale = ((receiver.getNextDisplayType() == 2) && (gametype ==
0)) ? 0.5f : 1.0f;
int topY = ((receiver.getNextDisplayType() == 2) && (gametype == 0)) ?
6 : 4;
@@ -370,7 +370,7 @@
receiver.drawScoreFont(engine, playerID, 11, 12, "MAX CHAIN",
EventReceiver.COLOR_BLUE);
receiver.drawScoreFont(engine, playerID, 11, 13,
String.valueOf(engine.statistics.maxChain));

- if(dangerColumnShowX && engine.gameStarted && (engine.stat !=
GameEngine.STAT_MOVE) && (engine.stat != GameEngine.STAT_RESULT)) {
+ if(dangerColumnShowX && engine.gameStarted && (engine.stat !=
GameEngine.Status.MOVE) && (engine.stat != GameEngine.Status.RESULT)) {
drawXorTimer(engine, playerID);
}

@@ -428,7 +428,7 @@
if((engine.statistics.time >= ULTRA_MAX_TIME) && (engine.timerActive ==
true)) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
return;
}
} else if (gametype == 2) {
@@ -444,7 +444,7 @@
if((engine.statistics.score >= SPRINT_MAX_SCORE[sprintTarget]) &&
(engine.timerActive == true)) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
}
}
}
@@ -478,7 +478,7 @@
{
if (!engine.field.getBlockEmpty(2, 0) || (dangerColumnDouble
&& !engine.field.getBlockEmpty(3, 0)))
{
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
engine.gameEnded();
engine.resetStatc();
engine.statc[1] = 1;
=======================================
---
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
Mon Nov 26 08:57:10 2012
+++
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
Mon Nov 26 09:39:55 2012
@@ -359,8 +359,8 @@
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -499,11 +499,11 @@
receiver.drawDirectFont(engine, playerID, fldPosX - 28, fldPosY + 264,
String.format("%8s", strScoreMultiplier), playerColor);
}

- if((engine.stat != GameEngine.STAT_MOVE) && (engine.stat !=
GameEngine.STAT_RESULT) && (engine.gameStarted)) {
+ if((engine.stat != GameEngine.Status.MOVE) && (engine.stat !=
GameEngine.Status.RESULT) && (engine.gameStarted)) {
drawX(engine, playerID);
}

- if((engine.stat != GameEngine.STAT_RESULT) && (engine.gameStarted)) {
+ if((engine.stat != GameEngine.Status.RESULT) && (engine.gameStarted)) {
if (engine.field != null)
for (int x = 0; x < engine.field.getWidth(); x++)
for (int y = 0; y < engine.field.getHeight(); y++)
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Mon Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Mon Nov 26 09:39:55 2012
@@ -303,8 +303,8 @@
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -490,7 +490,7 @@

if (!owner.engine[playerID].gameActive)
return;
- if((engine.stat != GameEngine.STAT_MOVE) && (engine.stat !=
GameEngine.STAT_RESULT) && (engine.gameStarted))
+ if((engine.stat != GameEngine.Status.MOVE) && (engine.stat !=
GameEngine.Status.RESULT) && (engine.gameStarted))
drawX(engine, playerID);
drawHardOjama(engine, playerID);

@@ -523,7 +523,7 @@
if (!engine.field.getBlockEmpty(2, 0) ||
(dangerColumnDouble[playerID] && !engine.field.getBlockEmpty(3, 0)))
{
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
}
}
return false;
@@ -543,27 +543,27 @@

// 決着
if((playerID == 1) && (owner.engine[0].gameActive)) {
- boolean p1Lose = (owner.engine[0].stat == GameEngine.STAT_GAMEOVER);
- if (!p1Lose && owner.engine[1].field != null && owner.engine[1].stat !=
GameEngine.STAT_READY)
+ boolean p1Lose = (owner.engine[0].stat == GameEngine.Status.GAMEOVER);
+ if (!p1Lose && owner.engine[1].field != null && owner.engine[1].stat !=
GameEngine.Status.READY)
p1Lose = (owner.engine[1].field.getHowManyGems() == 0);
- boolean p2Lose = (owner.engine[1].stat == GameEngine.STAT_GAMEOVER);
- if (!p2Lose && owner.engine[0].field != null && owner.engine[0].stat !=
GameEngine.STAT_READY)
+ boolean p2Lose = (owner.engine[1].stat == GameEngine.Status.GAMEOVER);
+ if (!p2Lose && owner.engine[0].field != null && owner.engine[0].stat !=
GameEngine.Status.READY)
p2Lose = (owner.engine[0].field.getHowManyGems() == 0);
if(p1Lose && p2Lose) {
// Draw
winnerID = -1;
- owner.engine[0].stat = GameEngine.STAT_GAMEOVER;
- owner.engine[1].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[0].stat = GameEngine.Status.GAMEOVER;
+ owner.engine[1].stat = GameEngine.Status.GAMEOVER;
} else if(p2Lose && !p1Lose) {
// 1P win
winnerID = 0;
- owner.engine[0].stat = GameEngine.STAT_EXCELLENT;
- owner.engine[1].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[0].stat = GameEngine.Status.EXCELLENT;
+ owner.engine[1].stat = GameEngine.Status.GAMEOVER;
} else if(p1Lose && !p2Lose) {
// 2P win
winnerID = 1;
- owner.engine[0].stat = GameEngine.STAT_GAMEOVER;
- owner.engine[1].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[0].stat = GameEngine.Status.GAMEOVER;
+ owner.engine[1].stat = GameEngine.Status.EXCELLENT;
}
if (p1Lose || p2Lose) {
owner.engine[0].gameEnded();
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDummyMode.java
Sat Nov 10 01:54:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDummyMode.java
Mon Nov 26 09:39:55 2012
@@ -741,11 +741,11 @@
if (big[playerID])
{
if (!engine.field.getBlockEmpty(1, 0))
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
}
else if (!engine.field.getBlockEmpty(2, 0) ||
(dangerColumnDouble[playerID] && !engine.field.getBlockEmpty(3, 0)))
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
}

protected void loadFeverMap(GameEngine engine, int playerID, int chain) {
@@ -779,23 +779,23 @@

// 決着
if((playerID == 1) && (owner.engine[0].gameActive)) {
- boolean p1Lose = (owner.engine[0].stat == GameEngine.STAT_GAMEOVER);
- boolean p2Lose = (owner.engine[1].stat == GameEngine.STAT_GAMEOVER);
+ boolean p1Lose = (owner.engine[0].stat == GameEngine.Status.GAMEOVER);
+ boolean p2Lose = (owner.engine[1].stat == GameEngine.Status.GAMEOVER);
if(p1Lose && p2Lose) {
// Draw
winnerID = -1;
- owner.engine[0].stat = GameEngine.STAT_GAMEOVER;
- owner.engine[1].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[0].stat = GameEngine.Status.GAMEOVER;
+ owner.engine[1].stat = GameEngine.Status.GAMEOVER;
} else if(p2Lose && !p1Lose) {
// 1P win
winnerID = 0;
- owner.engine[0].stat = GameEngine.STAT_EXCELLENT;
- owner.engine[1].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[0].stat = GameEngine.Status.EXCELLENT;
+ owner.engine[1].stat = GameEngine.Status.GAMEOVER;
} else if(p1Lose && !p2Lose) {
// 2P win
winnerID = 1;
- owner.engine[0].stat = GameEngine.STAT_GAMEOVER;
- owner.engine[1].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[0].stat = GameEngine.Status.GAMEOVER;
+ owner.engine[1].stat = GameEngine.Status.EXCELLENT;
}
if (p1Lose || p2Lose) {
owner.engine[0].gameEnded();
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
Mon Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
Mon Nov 26 09:39:55 2012
@@ -341,8 +341,8 @@
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -511,7 +511,7 @@
receiver.drawDirectFont(engine, playerID, fldPosX - 28, fldPosY + 264,
String.format("%8s", strScoreMultiplier), playerColor);
}

- if((engine.stat != GameEngine.STAT_MOVE) && (engine.stat !=
GameEngine.STAT_RESULT) && (engine.gameStarted))
+ if((engine.stat != GameEngine.Status.MOVE) && (engine.stat !=
GameEngine.Status.RESULT) && (engine.gameStarted))
drawX(engine, playerID);

if(ojamaHard[playerID] > 0)
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java Mon
Nov 26 09:39:55 2012
@@ -631,8 +631,8 @@
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -884,7 +884,7 @@
}
}

- if((engine.stat != GameEngine.STAT_MOVE) && (engine.stat !=
GameEngine.STAT_RESULT) && (engine.gameStarted))
+ if((engine.stat != GameEngine.Status.MOVE) && (engine.stat !=
GameEngine.Status.RESULT) && (engine.gameStarted))
drawXorTimer(engine, playerID);

if(ojamaHard[playerID] > 0)
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java Mon
Nov 26 09:39:55 2012
@@ -558,8 +558,8 @@
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -761,7 +761,7 @@
receiver.drawDirectFont(engine, playerID, fldPosX - 28, fldPosY + 264,
String.format("%8s", strScoreMultiplier), playerColor);
}

- if((engine.stat != GameEngine.STAT_MOVE) && (engine.stat !=
GameEngine.STAT_RESULT) && (engine.gameStarted))
+ if((engine.stat != GameEngine.Status.MOVE) && (engine.stat !=
GameEngine.Status.RESULT) && (engine.gameStarted))
drawX(engine, playerID);

if (!owner.engine[playerID].gameActive)
@@ -772,7 +772,7 @@
int blockColor, textColor;
int d = (engine.displaysize == 1) ? 2 : 1;
String str;
- if((engine.field != null) && (engine.stat != GameEngine.STAT_RESULT) &&
(engine.gameStarted))
+ if((engine.field != null) && (engine.stat != GameEngine.Status.RESULT)
&& (engine.gameStarted))
for (int x = 0; x < engine.field.getWidth(); x++)
for (int y = 0; y < engine.field.getHeight(); y++)
{
@@ -907,7 +907,7 @@
//Check for game over
if (!engine.field.getBlockEmpty(2, 0) ||
(dangerColumnDouble[playerID] && !engine.field.getBlockEmpty(3, 0)))
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
return false;
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java Mon Nov
26 09:39:55 2012
@@ -583,7 +583,7 @@
else
receiver.drawScoreFont(engine, playerID, 0, 1, "(" +
GOAL_TABLE[goaltype] + " LINES GAME)", EventReceiver.COLOR_WHITE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if(!owner.replayMode && !big && (engine.ai == null)) {
receiver.drawScoreFont(engine, playerID, 3, 3, "COMBO TIME",
EventReceiver.COLOR_BLUE);

@@ -771,7 +771,7 @@
engine.gameEnded();
engine.resetStatc();
engine.stat = (engine.statistics.maxCombo > 40) ?
- GameEngine.STAT_EXCELLENT : GameEngine.STAT_GAMEOVER;
+ GameEngine.Status.EXCELLENT : GameEngine.Status.GAMEOVER;
}
}

@@ -789,9 +789,9 @@
@Override
public void renderResult(GameEngine engine, int playerID) {
drawResultStats(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN,
- STAT_MAXCOMBO, STAT_TIME);
+ Statistic.MAXCOMBO, Statistic.TIME);
drawResultStats(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
- STAT_LINES, STAT_PIECE, STAT_LPM, STAT_PPS);
+ Statistic.LINES, Statistic.PIECE, Statistic.LPM, Statistic.PPS);
drawResultRank(engine, playerID, receiver, 12, EventReceiver.COLOR_BLUE,
rankingRank);
drawResultNetRank(engine, playerID, receiver, 14,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 16,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java Mon
Nov 26 09:39:55 2012
@@ -404,7 +404,7 @@
receiver.drawScoreFont(engine, playerID, 0, 1, "(REALTIME GAME)",
EventReceiver.COLOR_GREEN);
}

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel == 0) && (engine.ai ==
null)) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 6 : 4;
@@ -543,7 +543,7 @@

// Add Garbage (Realtime)
if((garbageTimer >= getGarbageMaxTime(engine.statistics.level)) &&
(goaltype == GOALTYPE_REALTIME) &&
- (engine.stat != GameEngine.STAT_LINECLEAR) && (!netIsWatch))
+ (engine.stat != GameEngine.Status.LINECLEAR) && (!netIsWatch))
{
addGarbage(engine);
garbageTimer = 0;
@@ -554,7 +554,7 @@
netSendStats(engine);
}

- if((engine.stat == GameEngine.STAT_MOVE) && (engine.nowPieceObject !=
null)) {
+ if((engine.stat == GameEngine.Status.MOVE) &&
(engine.nowPieceObject != null)) {
if(engine.nowPieceObject.checkCollision(engine.nowPieceX,
engine.nowPieceY, engine.field)) {
// Push up the current piece
while(engine.nowPieceObject.checkCollision(engine.nowPieceX,
engine.nowPieceY, engine.field)) {
@@ -563,7 +563,7 @@

// Pushed out from the visible part of the field
if(!engine.nowPieceObject.canPlaceToVisibleField(engine.nowPieceX,
engine.nowPieceY, engine.field)) {
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
engine.resetStatc();
engine.gameEnded();
}
@@ -812,11 +812,11 @@
@Override
public void renderResult(GameEngine engine, int playerID) {
drawResultStats(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES);
+ Statistic.SCORE, Statistic.LINES);
drawResult(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
"GARBAGE", String.format("%10d", garbageTotal));
drawResultStats(engine, playerID, receiver, 6, EventReceiver.COLOR_BLUE,
- STAT_PIECE, STAT_LEVEL, STAT_TIME);
+ Statistic.PIECE, Statistic.LEVEL, Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12, EventReceiver.COLOR_BLUE,
rankingRank);
drawResultNetRank(engine, playerID, receiver, 14,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 16,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java Mon Nov 26
08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java Mon Nov 26
09:39:55 2012
@@ -452,7 +452,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "DIG RACE",
EventReceiver.COLOR_GREEN);
receiver.drawScoreFont(engine, playerID, 0, 1, "(" +
GOAL_TABLE[goaltype] + " GARBAGE GAME)", EventReceiver.COLOR_GREEN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if(!owner.replayMode && (engine.ai == null) && !netIsWatch) {
String strPieceTemp = (owner.receiver.getNextDisplayType() ==
2) ? "P." : "PIECE";
receiver.drawScoreFont(engine, playerID, 3, 3, "TIME LINE " +
strPieceTemp, EventReceiver.COLOR_BLUE);
@@ -536,7 +536,7 @@
@Override
public void renderResult(GameEngine engine, int playerID) {
drawResultStats(engine, playerID, receiver, 1, EventReceiver.COLOR_BLUE,
- STAT_LINES, STAT_PIECE, STAT_TIME, STAT_LPM, STAT_PPS);
+ Statistic.LINES, Statistic.PIECE, Statistic.TIME, Statistic.LPM,
Statistic.PPS);
drawResultRank(engine, playerID, receiver, 11, EventReceiver.COLOR_BLUE,
rankingRank);
drawResultNetRank(engine, playerID, receiver, 13,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 15,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java Mon Nov 26
08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java Mon Nov 26
09:39:55 2012
@@ -402,7 +402,7 @@

receiver.drawScoreFont(engine, playerID, 0, 0, "EXTREME",
EventReceiver.COLOR_RED);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (big == false) && (engine.ai ==
null)) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 6 : 4;
@@ -536,7 +536,7 @@
if(rolltime >= ROLLTIMELIMIT) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}

@@ -709,7 +709,7 @@
@Override
public void renderResult(GameEngine engine, int playerID) {
drawResultStats(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL, STAT_TIME, STAT_SPL, STAT_LPM);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL, Statistic.TIME,
Statistic.SPL, Statistic.LPM);
drawResultRank(engine, playerID, receiver, 12, EventReceiver.COLOR_BLUE,
rankingRank);
drawResultNetRank(engine, playerID, receiver, 14,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 16,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java Mon Nov 26
08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java Mon Nov 26
09:39:55 2012
@@ -458,7 +458,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "FINAL",
EventReceiver.COLOR_WHITE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Leaderboard
@@ -824,7 +824,7 @@
rollclear = 2;
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -858,7 +858,7 @@
}

drawResultStats(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_MANIA, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_MANIA,
Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, rankingRank);
if(secretGrade > 4) {
drawResult(engine, playerID, receiver, 14, EventReceiver.COLOR_BLUE,
@@ -885,7 +885,7 @@
if(medalCO >= 1) receiver.drawMenuFont(engine, playerID, 8, 4, "CO",
getMedalFontColor(medalCO));

drawResultStats(engine, playerID, receiver, 6, EventReceiver.COLOR_BLUE,
- STAT_LPS, STAT_SPS, STAT_PIECE, STAT_PPS);
+ Statistic.LPS, Statistic.SPS, Statistic.PIECE, Statistic.PPS);
}
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java Mon
Nov 26 09:39:55 2012
@@ -487,7 +487,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "GARBAGE MANIA",
EventReceiver.COLOR_CYAN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (always20g == false) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Rankings
@@ -826,7 +826,7 @@
if(rolltime >= ROLLTIMELIMIT) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -851,7 +851,7 @@

if(engine.statc[1] == 0) {
drawResultStats(engine, playerID, receiver, 2, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_MANIA, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_MANIA,
Statistic.TIME);
drawResult(engine, playerID, receiver, 10, EventReceiver.COLOR_BLUE,
"GARBAGE", String.format("%10d", garbageTotal));
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, rankingRank);
@@ -874,7 +874,7 @@
}
} else if(engine.statc[1] == 2) {
drawResultStats(engine, playerID, receiver, 1, EventReceiver.COLOR_BLUE,
- STAT_LPM, STAT_SPM, STAT_PIECE, STAT_PPS);
+ Statistic.LPM, Statistic.SPM, Statistic.PIECE, Statistic.PPS);
}
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GemManiaMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GemManiaMode.java Mon Nov
26 09:39:55 2012
@@ -523,11 +523,11 @@
skipflag = false;
engine.nowPieceObject = null;
engine.timerActive = false;
- engine.stat = GameEngine.STAT_CUSTOM;
+ engine.stat = GameEngine.Status.CUSTOM;
engine.resetStatc();
} else if((limittimeNow <= 0) && (engine.timerActive)) {
engine.nowPieceObject = null;
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
engine.resetStatc();
}
}
@@ -913,7 +913,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "GEM MANIA " +
((randomnext) ? "(RANDOM)" : ""), EventReceiver.COLOR_RED);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((startstage == 0) && (always20g == false) && (trainingType == 0) &&
(startnextc == 0) && (stageset < 0) && (engine.ai == null)) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 5 : 3;
@@ -1039,7 +1039,7 @@
skipflag = true;
engine.nowPieceObject = null;
engine.timerActive = false;
- engine.stat = GameEngine.STAT_CUSTOM;
+ engine.stat = GameEngine.Status.CUSTOM;
engine.resetStatc();
}
} else {
@@ -1324,7 +1324,7 @@
if(clearflag) limittimeNow += timeextendStageClearSeconds * 60;
if(skipflag) limittimeNow -= timeextendStageClearSeconds * 60;
if(trainingType == 2) engine.nextPieceCount = continueNextPieceCount;
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.resetStatc();
}
// Ending
@@ -1332,7 +1332,7 @@
allclear = (stage >= MAX_STAGE_TOTAL - 1) ? 2 : 1;
engine.ending = 1;
engine.gameEnded();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
engine.resetStatc();
}
// Next stage
@@ -1340,7 +1340,7 @@
stage++;
if(clearflag) limittimeNow += timeextendStageClearSeconds * 60;
if(skipflag) limittimeNow -= timeextendStageClearSeconds * 60;
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.resetStatc();
}
return true;
@@ -1466,7 +1466,7 @@
engine.nextPieceCount = continueNextPieceCount;
if(trainingType == 0) engine.statistics.time += 60 * 60 * 2;
engine.allowTextRenderByReceiver = true;
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.resetStatc();
engine.playSE("decide");
} else {
@@ -1551,7 +1551,7 @@
drawResult(engine, playerID, receiver, 4, EventReceiver.COLOR_PINK,
"CLEAR", String.format("%9d%%", clearper));
drawResultStats(engine, playerID, receiver, 6, EventReceiver.COLOR_PINK,
- STAT_LINES, STAT_PIECE, STAT_TIME);
+ Statistic.LINES, Statistic.PIECE, Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_PINK, rankingRank);
} else if(engine.statc[1] == 1) {
receiver.drawMenuFont(engine, playerID, 0, 2, "SECTION1/2",
EventReceiver.COLOR_PINK);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java Mon
Nov 26 09:39:55 2012
@@ -621,7 +621,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "GRADE MANIA 2",
EventReceiver.COLOR_CYAN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel.value == 0) && (big.value
== false) && (always20g.value == false) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Rankings
@@ -1134,7 +1134,7 @@

engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -1178,7 +1178,7 @@
receiver.drawMenuFont(engine, playerID, 0, 3, strGrade, gcolor);

drawResultStats(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_MANIA, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_MANIA,
Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, rankingRank);
if(secretGrade > 4) {
drawResult(engine, playerID, receiver, 14, EventReceiver.COLOR_BLUE,
@@ -1207,7 +1207,7 @@
if(medalCO >= 1) receiver.drawMenuFont(engine, playerID, 8, 5, "CO",
getMedalFontColor(medalCO));

drawResultStats(engine, playerID, receiver, 6, EventReceiver.COLOR_BLUE,
- STAT_LPM, STAT_SPM, STAT_PIECE, STAT_PPS);
+ Statistic.LPM, Statistic.SPM, Statistic.PIECE, Statistic.PPS);
}
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java Mon
Nov 26 09:39:55 2012
@@ -926,7 +926,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "GRADE MANIA 3" +
(enableexam ? "(+EXAM)" : ""), EventReceiver.COLOR_CYAN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (!owner.replayMode)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (!owner.replayMode)) ) {
if((startlevel == 0) && (!big) && (!always20g) && (!owner.replayMode)
&& (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Rankings
@@ -1561,7 +1561,7 @@

engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
}
}
@@ -1649,7 +1649,7 @@
receiver.drawMenuFont(engine, playerID, 0, 3, strGrade, gcolor);

drawResultStats(engine, playerID, receiver, 4,
EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_MANIA, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_MANIA,
Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, rankingRank);
if(secretGrade > 4) {
drawResult(engine, playerID, receiver, 14, EventReceiver.COLOR_BLUE,
@@ -1689,7 +1689,7 @@
}

drawResultStats(engine, playerID, receiver, 8,
EventReceiver.COLOR_BLUE,
- STAT_LPM, STAT_SPM, STAT_PIECE, STAT_PPS);
+ Statistic.LPM, Statistic.SPM, Statistic.PIECE, Statistic.PPS);
}
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java Mon Nov
26 09:39:55 2012
@@ -407,7 +407,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "GRADE MANIA",
EventReceiver.COLOR_CYAN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (!owner.replayMode)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (!owner.replayMode)) ) {
if((owner.replayMode == false) && (startlevel.value == 0) &&
(!big.value) && (!always20g.value) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Rankings
@@ -719,7 +719,7 @@
if(rolltime >= ROLLTIMELIMIT) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -747,7 +747,7 @@
"GRADE", String.format("%10s", tableGradeName[grade]));

drawResultStats(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_MANIA, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_MANIA,
Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, rankingRank);
if(secretGrade > 4) {
drawResult(engine, playerID, receiver, 14, EventReceiver.COLOR_BLUE,
@@ -768,7 +768,7 @@
}
} else if(engine.statc[1] == 2) {
drawResultStats(engine, playerID, receiver, 2, EventReceiver.COLOR_BLUE,
- STAT_LPM, STAT_SPM, STAT_PIECE, STAT_PPS);
+ Statistic.LPM, Statistic.SPM, Statistic.PIECE, Statistic.PPS);

if(grade == 18) {
int pierRank = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/LegacyNetVSBattleMode.java
Mon Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/LegacyNetVSBattleMode.java
Mon Nov 26 09:39:55 2012
@@ -832,7 +832,7 @@
isPractice = true;
isPracticeExitAllowed = false;
engine.init();
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.resetStatc();

// map
@@ -1604,10 +1604,10 @@
isPractice = false;
engine.field.reset();
engine.gameEnded();
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.resetStatc();
} else {
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
engine.resetStatc();
}
}
@@ -1687,7 +1687,7 @@
}

// garbage blockcount
- if((garbage[playerID] > 0) && (useFractionalGarbage) && (engine.stat !=
GameEngine.STAT_RESULT)) {
+ if((garbage[playerID] > 0) && (useFractionalGarbage) && (engine.stat !=
GameEngine.Status.RESULT)) {
String strTempGarbage;

int fontColor = EventReceiver.COLOR_WHITE;
@@ -1857,7 +1857,7 @@

if(engine.displaysize != -1) {
int y = 21;
- if(engine.stat == GameEngine.STAT_RESULT) y = 22;
+ if(engine.stat == GameEngine.Status.RESULT) y = 22;
receiver.drawMenuFont(engine, playerID, 0, y, strTemp,
EventReceiver.COLOR_WHITE);
} else {
int x = receiver.getFieldDisplayPositionX(engine, playerID);
@@ -1881,7 +1881,7 @@
return false;
} else {
engine.field.reset();
- engine.stat = GameEngine.STAT_RESULT;
+ engine.stat = GameEngine.Status.RESULT;
engine.resetStatc();
return true;
}
@@ -1895,7 +1895,7 @@
if((numNowPlayers == 2) && (numMaxPlayers == 2))
netSendNextAndHold(engine);
netLobby.netPlayerClient.send("dead\t" + lastAttackerUID + "\n");

- engine.stat = GameEngine.STAT_CUSTOM;
+ engine.stat = GameEngine.Status.CUSTOM;
engine.resetStatc();
return true;
}
@@ -1905,7 +1905,7 @@
engine.statistics.time = netPlayTimer;
}
if(engine.field == null) {
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.resetStatc();
return true;
}
@@ -1983,7 +1983,7 @@
public boolean onCustom(GameEngine engine, int playerID) {
if(!isNetGameActive) {
isDead[playerID] = true;
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
engine.resetStatc();
}
return false;
@@ -2012,7 +2012,7 @@
if((engine.statc[0] >= engine.field.getHeight() + 1 + 180) &&
(!isNetGameActive) && (isPlayerResultReceived[playerID])) {
if(engine.field != null) engine.field.reset();
engine.resetStatc();
- engine.stat = GameEngine.STAT_RESULT;
+ engine.stat = GameEngine.Status.RESULT;
} else {
engine.statc[0]++;
}
@@ -2145,7 +2145,7 @@
@Override
public void netlobbyOnDisconnect(NetLobbyFrame lobby, NetPlayerClient
client, Throwable ex) {
for(int i = 0; i < getPlayers(); i++) {
- owner.engine[i].stat = GameEngine.STAT_NOTHING;
+ owner.engine[i].stat = GameEngine.Status.NOTHING;
}
}

@@ -2215,7 +2215,7 @@
}

isPractice = false;
- owner.engine[0].stat = GameEngine.STAT_SETTING;
+ owner.engine[0].stat = GameEngine.Status.SETTING;

for(int i = 0; i < getPlayers(); i++) {
if(owner.engine[i].field != null) {
@@ -2224,8 +2224,8 @@
owner.engine[i].nowPieceObject = null;
garbage[i] = 0;

- if((owner.engine[i].stat == GameEngine.STAT_NOTHING) ||
(isNetGameFinished)) {
- owner.engine[i].stat = GameEngine.STAT_SETTING;
+ if((owner.engine[i].stat == GameEngine.Status.NOTHING) ||
(isNetGameFinished)) {
+ owner.engine[i].stat = GameEngine.Status.SETTING;
}
owner.engine[i].resetStatc();
}
@@ -2307,7 +2307,7 @@

if(isPlayerExist[i]) {
playerActive[i] = true;
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.randSeed = randseed;
engine.random = new Random(randseed);

@@ -2328,7 +2328,7 @@
}
}
} else if(i < numMaxPlayers) {
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.isVisible = true;
engine.isNextVisible = false;
engine.isHoldVisible = false;
@@ -2337,7 +2337,7 @@
engine.isVisible = false;
}
} else {
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.isVisible = false;
}

@@ -2369,7 +2369,7 @@
isDead[playerID] = true;
playerPlace[playerID] = Integer.parseInt(message[4]);
owner.engine[playerID].gameEnded();
- owner.engine[playerID].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[playerID].stat = GameEngine.Status.GAMEOVER;
owner.engine[playerID].resetStatc();
numAlivePlayers--;

@@ -2402,7 +2402,7 @@
isPractice = false;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
owner.engine[0].gameEnded();
- owner.engine[0].stat = GameEngine.STAT_SETTING;
+ owner.engine[0].stat = GameEngine.Status.SETTING;
owner.engine[0].resetStatc();
}

@@ -2414,7 +2414,7 @@
if(isPlayerExist[i] && !isDead[i]) {
playerPlace[i] = 1;
owner.engine[i].gameEnded();
- owner.engine[i].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[i].stat = GameEngine.Status.EXCELLENT;
owner.engine[i].resetStatc();
owner.engine[i].statistics.time = netPlayTimer;
numAlivePlayers--;
@@ -2432,7 +2432,7 @@
if(isPlayerExist[playerID]) {
playerPlace[playerID] = 1;
owner.engine[playerID].gameEnded();
- owner.engine[playerID].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[playerID].stat = GameEngine.Status.EXCELLENT;
owner.engine[playerID].resetStatc();
owner.engine[playerID].statistics.time = netPlayTimer;
numAlivePlayers--;
@@ -2530,8 +2530,8 @@
owner.engine[playerID].nowPieceBottomY =
owner.engine[playerID].nowPieceObject.getBottom(pieceX, pieceY,
owner.engine[playerID].field);

- if(owner.engine[playerID].stat != GameEngine.STAT_EXCELLENT) {
- owner.engine[playerID].stat = GameEngine.STAT_MOVE;
+ if(owner.engine[playerID].stat != GameEngine.Status.EXCELLENT) {
+ owner.engine[playerID].stat = GameEngine.Status.MOVE;
owner.engine[playerID].statc[0] = 2;
}

@@ -2546,7 +2546,7 @@
}

if((playerSeatNumber != -1) && (netPlayTimerActive) && (!isPractice) &&
- (owner.engine[0].stat == GameEngine.STAT_READY) &&
(owner.engine[0].statc[0] < owner.engine[0].goEnd))
+ (owner.engine[0].stat == GameEngine.Status.READY) &&
(owner.engine[0].statc[0] < owner.engine[0].goEnd))
{
owner.engine[0].statc[0] = owner.engine[0].goEnd;
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/LineRaceMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/LineRaceMode.java Mon Nov
26 09:39:55 2012
@@ -358,7 +358,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "LINE RACE",
EventReceiver.COLOR_RED);
receiver.drawScoreFont(engine, playerID, 0, 1, "(" +
GOAL_TABLE[goaltype] + " LINES GAME)", EventReceiver.COLOR_RED);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if(!owner.replayMode && !big && (engine.ai == null) && !netIsWatch) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 6 : 4;
@@ -446,7 +446,7 @@
@Override
public void renderResult(GameEngine engine, int playerID) {
drawResultStats(engine, playerID, receiver, 1, EventReceiver.COLOR_BLUE,
- STAT_LINES, STAT_PIECE, STAT_TIME, STAT_LPM, STAT_PPS);
+ Statistic.LINES, Statistic.PIECE, Statistic.TIME, Statistic.LPM,
Statistic.PPS);
drawResultRank(engine, playerID, receiver, 11, EventReceiver.COLOR_BLUE,
rankingRank);
drawResultNetRank(engine, playerID, receiver, 13,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 15,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java Mon Nov
26 09:39:55 2012
@@ -401,7 +401,7 @@
receiver.drawScoreFont(engine, playerID, 0, 1, "(" +
tableGameClearLines[goaltype] + " LINES GAME)", EventReceiver.COLOR_GREEN);
}

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (big == false) && (engine.ai ==
null)) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 6 : 4;
@@ -688,7 +688,7 @@
@Override
public void renderResult(GameEngine engine, int playerID) {
drawResultStats(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL, STAT_TIME, STAT_SPL, STAT_LPM);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL, Statistic.TIME,
Statistic.SPL, Statistic.LPM);
drawResultRank(engine, playerID, receiver, 12, EventReceiver.COLOR_BLUE,
rankingRank);
drawResultNetRank(engine, playerID, receiver, 14,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 16,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java Mon
Nov 26 09:39:55 2012
@@ -424,7 +424,7 @@
receiver.drawScoreFont(engine, playerID, 0, 1, "(NORMAL GAME)",
EventReceiver.COLOR_GREEN);
}

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if( (owner.replayMode == false) && (big == false) && ((startlevel == 0)
|| (startlevel == 20)) && (engine.ai == null) ) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 6 : 4;
@@ -769,7 +769,7 @@
*/
@Override
public boolean onEndingStart(GameEngine engine, int playerID) {
- engine.stat = GameEngine.STAT_CUSTOM;
+ engine.stat = GameEngine.Status.CUSTOM;
engine.resetStatc();
return true;
}
@@ -801,7 +801,7 @@
}
} else if(engine.statc[0] >= 480) {
engine.ending = 0;
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.resetStatc();

// NET: Send game restarted messages
@@ -854,12 +854,12 @@
receiver.drawMenuFont(engine, playerID, 0, 0, "kn PAGE" +
(engine.statc[1] + 1) + "/2", EventReceiver.COLOR_RED);

if(engine.statc[1] == 0) {
- drawResultStats(engine, playerID, receiver, 2,
EventReceiver.COLOR_BLUE, STAT_SCORE, STAT_LINES);
+ drawResultStats(engine, playerID, receiver, 2,
EventReceiver.COLOR_BLUE, Statistic.SCORE, Statistic.LINES);
if(engine.statistics.level >= 20) {
drawResult(engine, playerID, receiver, 6, EventReceiver.COLOR_BLUE,
"BONUS LINE", String.format("%10d", bonusLines));
} else {
- drawResultStats(engine, playerID, receiver, 6,
EventReceiver.COLOR_BLUE, STAT_LEVEL);
+ drawResultStats(engine, playerID, receiver, 6,
EventReceiver.COLOR_BLUE, Statistic.LEVEL);
}
drawResult(engine, playerID, receiver, 8, EventReceiver.COLOR_BLUE,
"TOTAL TIME", String.format("%10s",
GeneralUtil.getTime(engine.statistics.time)),
@@ -871,7 +871,7 @@
drawResultNetRankDaily(engine, playerID, receiver, 18,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
} else {
drawResultStats(engine, playerID, receiver, 2, EventReceiver.COLOR_BLUE,
- STAT_SPL, STAT_SPM, STAT_LPM, STAT_PPS);
+ Statistic.SPL, Statistic.SPM, Statistic.LPM, Statistic.PPS);
}

if(netIsPB) {
@@ -1056,13 +1056,13 @@
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
engine.timerActive = false;
engine.ending = 1;
- engine.stat = GameEngine.STAT_CUSTOM;
+ engine.stat = GameEngine.Status.CUSTOM;
engine.resetStatc();
}
// Bonus level started
else if(message[3].equals("bonuslevelstart")) {
engine.ending = 0;
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.resetStatc();
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyMode.java Mon Nov
26 09:39:55 2012
@@ -210,7 +210,7 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- engine.stat = GameEngine.STAT_NOTHING;
+ engine.stat = GameEngine.Status.NOTHING;
engine.isVisible = false;
}

@@ -366,7 +366,7 @@
return false;
} else {
engine.field.reset();
- engine.stat = GameEngine.STAT_RESULT;
+ engine.stat = GameEngine.Status.RESULT;
engine.resetStatc();
return true;
}
@@ -501,7 +501,7 @@

if(netIsWatch) {
owner.reset();
- owner.engine[0].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
}
}
@@ -512,8 +512,8 @@
if(netIsWatch) {
owner.engine[0].gameEnded();

- if((owner.engine[0].stat != GameEngine.STAT_GAMEOVER) &&
(owner.engine[0].stat != GameEngine.STAT_RESULT)) {
- owner.engine[0].stat = GameEngine.STAT_GAMEOVER;
+ if((owner.engine[0].stat != GameEngine.Status.GAMEOVER) &&
(owner.engine[0].stat != GameEngine.Status.RESULT)) {
+ owner.engine[0].stat = GameEngine.Status.GAMEOVER;
owner.engine[0].resetStatc();
}
}
@@ -550,7 +550,7 @@

// Move cursor
if(message[3].equals("cursor")) {
- if(engine.stat == GameEngine.STAT_SETTING) {
+ if(engine.stat == GameEngine.Status.SETTING) {
menuCursor = Integer.parseInt(message[4]);
engine.playSE("cursor");
}
@@ -579,26 +579,26 @@
if(message[3].equals("ending")) {
engine.ending = 1;
if(!engine.staffrollEnable) engine.gameEnded();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
engine.resetStatc();
}
// Excellent
if(message[3].equals("excellent")) {
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
engine.resetStatc();
}
// Retry
if(message[3].equals("retry")) {
engine.ending = 0;
engine.gameEnded();
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.resetStatc();
engine.playSE("decide");
}
// Display results screen
if(message[3].equals("resultsscreen")) {
engine.field.reset();
- engine.stat = GameEngine.STAT_RESULT;
+ engine.stat = GameEngine.Status.RESULT;
engine.resetStatc();
}
}
@@ -731,7 +731,7 @@
owner.receiver.drawScoreFont(engine, engine.playerID, x,
y+0, "SPECTATORS", fontcolor);
owner.receiver.drawScoreFont(engine, engine.playerID, x, y+1, "" +
netNumSpectators, EventReceiver.COLOR_WHITE);

- if(engine.stat == GameEngine.STAT_SETTING && !netIsWatch &&
netIsNetRankingViewOK(engine)) {
+ if(engine.stat == GameEngine.Status.SETTING && !netIsWatch &&
netIsNetRankingViewOK(engine)) {
int y2 = y + 2;
if(y2 > 24) y2 = 24;
String strBtnD = engine.owner.receiver.getKeyNameByButtonID(engine,
Controller.BUTTON_D);
@@ -819,12 +819,12 @@
engine.nowPieceBottomY =
engine.nowPieceObject.getBottom(pieceX, pieceY, engine.field);

- if((engine.stat != GameEngine.STAT_EXCELLENT) && (engine.stat !=
GameEngine.STAT_GAMEOVER) &&
- (engine.stat != GameEngine.STAT_RESULT))
+ if((engine.stat != GameEngine.Status.EXCELLENT) && (engine.stat !=
GameEngine.Status.GAMEOVER) &&
+ (engine.stat != GameEngine.Status.RESULT))
{
engine.gameActive = true;
engine.timerActive = true;
- engine.stat = GameEngine.STAT_MOVE;
+ engine.stat = GameEngine.Status.MOVE;
engine.statc[0] = 2;
}

@@ -892,7 +892,7 @@
if(message.length > 4) {
engine.nowPieceObject = null;
engine.holdDisable = false;
- if(engine.stat == GameEngine.STAT_SETTING) engine.stat =
GameEngine.STAT_MOVE;
+ if(engine.stat == GameEngine.Status.SETTING) engine.stat =
GameEngine.Status.MOVE;
int skin = Integer.parseInt(message[4]);
netPlayerSkin = skin;
if(message.length > 6) {
@@ -909,7 +909,7 @@
if(message.length > 5) {
engine.nowPieceObject = null;
engine.holdDisable = false;
- if(engine.stat == GameEngine.STAT_SETTING) engine.stat =
GameEngine.STAT_MOVE;
+ if(engine.stat == GameEngine.Status.SETTING) engine.stat =
GameEngine.Status.MOVE;
int skin = Integer.parseInt(message[4]);
int highestWallY = Integer.parseInt(message[5]);
netPlayerSkin = skin;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyVSMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyVSMode.java Mon Nov
26 09:39:55 2012
@@ -554,7 +554,7 @@
netvsIsPracticeExitAllowed = false;

engine.init();
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.resetStatc();
netUpdatePlayerExist();
netvsSetGameScreenLayout();
@@ -888,7 +888,7 @@
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
engine.field.reset();
engine.gameEnded();
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.resetStatc();
}
}
@@ -947,7 +947,7 @@
return false;
} else {
engine.field.reset();
- engine.stat = GameEngine.STAT_RESULT;
+ engine.stat = GameEngine.Status.RESULT;
engine.resetStatc();
return true;
}
@@ -969,7 +969,7 @@
// Player/Opponent died
if(netvsPlayerDead[playerID]) {
if(engine.field == null) {
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.resetStatc();
return true;
}
@@ -1055,7 +1055,7 @@
if((!netvsIsGameActive) && (netvsPlayerResultReceived[playerID])) {
if(engine.field != null) engine.field.reset();
engine.resetStatc();
- engine.stat = GameEngine.STAT_RESULT;
+ engine.stat = GameEngine.Status.RESULT;
}
} else {
engine.statc[0]++;
@@ -1109,7 +1109,7 @@
if(engine.ctrl.isPush(Controller.BUTTON_A)) {
engine.playSE("decide");
netvsIsPractice = false;
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.resetStatc();
return true;
}
@@ -1200,7 +1200,7 @@
@Override
public void netlobbyOnDisconnect(NetLobbyFrame lobby, NetPlayerClient
client, Throwable ex) {
for(int i = 0; i < getPlayers(); i++) {
- owner.engine[i].stat = GameEngine.STAT_NOTHING;
+ owner.engine[i].stat = GameEngine.Status.NOTHING;
}
}

@@ -1252,7 +1252,7 @@
netvsIsNewcomer = true;
}

- owner.engine[0].stat = GameEngine.STAT_SETTING;
+ owner.engine[0].stat = GameEngine.Status.SETTING;

for(int i = 0; i < getPlayers(); i++) {
if(owner.engine[i].field != null) {
@@ -1260,8 +1260,8 @@
}
owner.engine[i].nowPieceObject = null;

- if((owner.engine[i].stat == GameEngine.STAT_NOTHING) ||
(!netvsIsGameActive)) {
- owner.engine[i].stat = GameEngine.STAT_SETTING;
+ if((owner.engine[i].stat == GameEngine.Status.NOTHING) ||
(!netvsIsGameActive)) {
+ owner.engine[i].stat = GameEngine.Status.SETTING;
}
owner.engine[i].resetStatc();
}
@@ -1328,7 +1328,7 @@

if(netvsPlayerExist[i]) {
netvsPlayerActive[i] = true;
- engine.stat = GameEngine.STAT_READY;
+ engine.stat = GameEngine.Status.READY;
engine.randSeed = randseed;
engine.random = new Random(randseed);

@@ -1349,7 +1349,7 @@
}
}
} else if(i < netCurrentRoomInfo.maxPlayers) {
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.isVisible = true;
engine.isNextVisible = false;
engine.isHoldVisible = false;
@@ -1358,7 +1358,7 @@
engine.isVisible = false;
}
} else {
- engine.stat = GameEngine.STAT_SETTING;
+ engine.stat = GameEngine.Status.SETTING;
engine.isVisible = false;
}

@@ -1375,7 +1375,7 @@
if(!netvsPlayerDead[playerID]) {
netvsPlayerDead[playerID] = true;
netvsPlayerPlace[playerID] = Integer.parseInt(message[4]);
- owner.engine[playerID].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[playerID].stat = GameEngine.Status.GAMEOVER;
owner.engine[playerID].resetStatc();
netvsNumAlivePlayers--;

@@ -1410,7 +1410,7 @@
netvsIsPracticeExitAllowed = false;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
owner.engine[0].gameEnded();
- owner.engine[0].stat = GameEngine.STAT_SETTING;
+ owner.engine[0].stat = GameEngine.Status.SETTING;
owner.engine[0].resetStatc();
}

@@ -1422,7 +1422,7 @@
if(netvsPlayerExist[i] && !netvsPlayerDead[i]) {
netvsPlayerPlace[i] = 1;
owner.engine[i].gameEnded();
- owner.engine[i].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[i].stat = GameEngine.Status.EXCELLENT;
owner.engine[i].resetStatc();
owner.engine[i].statistics.time = netvsPlayTimer;
netvsNumAlivePlayers--;
@@ -1440,7 +1440,7 @@
if(netvsPlayerExist[playerID]) {
netvsPlayerPlace[playerID] = 1;
owner.engine[playerID].gameEnded();
- owner.engine[playerID].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[playerID].stat = GameEngine.Status.EXCELLENT;
owner.engine[playerID].resetStatc();
owner.engine[playerID].statistics.time = netvsPlayTimer;
netvsNumAlivePlayers--;
@@ -1489,7 +1489,7 @@

// Force start
if((!netvsIsWatch()) && (netvsPlayTimerActive) && (!netvsIsPractice) &&
- (engine.stat == GameEngine.STAT_READY) && (engine.statc[0] <
engine.goEnd))
+ (engine.stat == GameEngine.Status.READY) && (engine.statc[0] <
engine.goEnd))
{
engine.statc[0] = engine.goEnd;
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSBattleMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSBattleMode.java Mon
Nov 26 09:39:55 2012
@@ -656,7 +656,7 @@

if(netvsPlayerExist[playerID] && engine.isVisible) {
// Garbage Count
- if((garbage[playerID] > 0) && (netCurrentRoomInfo.useFractionalGarbage)
&& (engine.stat != GameEngine.STAT_RESULT)) {
+ if((garbage[playerID] > 0) && (netCurrentRoomInfo.useFractionalGarbage)
&& (engine.stat != GameEngine.Status.RESULT)) {
String strTempGarbage;

int fontColor = EventReceiver.COLOR_WHITE;
@@ -689,7 +689,7 @@
}

// Practice mode
- if((playerID == 0) && (netvsIsPractice) && (netvsIsPracticeExitAllowed)
&& (engine.stat != GameEngine.STAT_RESULT)) {
+ if((playerID == 0) && (netvsIsPractice) && (netvsIsPracticeExitAllowed)
&& (engine.stat != GameEngine.Status.RESULT)) {
if((lastevent[playerID] == EVENT_NONE) || (scgettime[playerID] >= 120))
{
owner.receiver.drawMenuFont(engine, 0, 0, 21,
"F(" + owner.receiver.getKeyNameByButtonID(engine,
Controller.BUTTON_F) + " KEY):\n END GAME",
@@ -856,7 +856,7 @@

if(engine.displaysize != -1) {
int y2 = 21;
- if(engine.stat == GameEngine.STAT_RESULT) y2 = 22;
+ if(engine.stat == GameEngine.Status.RESULT) y2 = 22;
owner.receiver.drawMenuFont(engine, playerID, 0, y2, strTemp,
EventReceiver.COLOR_WHITE);
} else {
owner.receiver.drawDirectFont(engine, playerID, x + 4, y + 168,
strTemp, EventReceiver.COLOR_WHITE, 0.5f);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSDigRaceMode.java Wed
Mar 2 05:03:18 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSDigRaceMode.java Mon
Nov 26 09:39:55 2012
@@ -256,7 +256,7 @@
// Game Completed
if(playerRemainLines[playerID] <= 0) {
if(netvsIsPractice) {
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
engine.resetStatc();
} else {
// Send game end message
@@ -280,7 +280,7 @@
netLobby.netPlayerClient.send(strMsg);

// Wait until everyone dies
- engine.stat = GameEngine.STAT_NOTHING;
+ engine.stat = GameEngine.Status.NOTHING;
engine.resetStatc();
}
}
@@ -299,7 +299,7 @@
int fontColor = EventReceiver.COLOR_WHITE;

if(netvsPlayerExist[playerID] && engine.isVisible) {
- if( ((netvsIsGameActive) || ((netvsIsPractice) && (playerID == 0))) &&
(engine.stat != GameEngine.STAT_RESULT) ) {
+ if( ((netvsIsGameActive) || ((netvsIsPractice) && (playerID == 0))) &&
(engine.stat != GameEngine.Status.RESULT) ) {
// Lines left
int remainLines = Math.max(0, playerRemainLines[playerID]);
fontColor = EventReceiver.COLOR_WHITE;
@@ -328,7 +328,7 @@
}
}

- if((netvsIsGameActive) && (engine.stat != GameEngine.STAT_RESULT)) {
+ if((netvsIsGameActive) && (engine.stat != GameEngine.Status.RESULT)) {
// Place
int place = getNowPlayerPlace(engine, playerID);
if(netvsPlayerDead[playerID]) place = netvsPlayerPlace[playerID];
@@ -369,7 +369,7 @@

if(engine.displaysize != -1) {
int y2 = 21;
- if(engine.stat == GameEngine.STAT_RESULT) y2 = 22;
+ if(engine.stat == GameEngine.Status.RESULT) y2 = 22;
owner.receiver.drawMenuFont(engine, playerID, 0, y2, strTemp,
EventReceiver.COLOR_WHITE);
} else {
owner.receiver.drawDirectFont(engine, playerID, x + 4, y + 168,
strTemp, EventReceiver.COLOR_WHITE, 0.5f);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSLineRaceMode.java Tue
Mar 1 04:39:13 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSLineRaceMode.java Mon
Nov 26 09:39:55 2012
@@ -126,7 +126,7 @@
// Game Completed
if((engine.statistics.lines >= goalLines) && (playerID == 0)) {
if(netvsIsPractice) {
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
engine.resetStatc();
} else {
// Send game end message
@@ -150,7 +150,7 @@
netLobby.netPlayerClient.send(strMsg);

// Wait until everyone dies
- engine.stat = GameEngine.STAT_NOTHING;
+ engine.stat = GameEngine.Status.NOTHING;
engine.resetStatc();
}
}
@@ -168,7 +168,7 @@
int fontColor = EventReceiver.COLOR_WHITE;

if(netvsPlayerExist[playerID] && engine.isVisible) {
- if( ((netvsIsGameActive) || ((netvsIsPractice) && (playerID == 0))) &&
(engine.stat != GameEngine.STAT_RESULT) ) {
+ if( ((netvsIsGameActive) || ((netvsIsPractice) && (playerID == 0))) &&
(engine.stat != GameEngine.Status.RESULT) ) {
// Lines left
int remainLines = Math.max(0, goalLines - engine.statistics.lines);
fontColor = EventReceiver.COLOR_WHITE;
@@ -197,7 +197,7 @@
}
}

- if((netvsIsGameActive) && (engine.stat != GameEngine.STAT_RESULT)) {
+ if((netvsIsGameActive) && (engine.stat != GameEngine.Status.RESULT)) {
// Place
int place = getNowPlayerPlace(engine, playerID);
if(netvsPlayerDead[playerID]) place = netvsPlayerPlace[playerID];
@@ -238,7 +238,7 @@

if(engine.displaysize != -1) {
int y2 = 21;
- if(engine.stat == GameEngine.STAT_RESULT) y2 = 22;
+ if(engine.stat == GameEngine.Status.RESULT) y2 = 22;
owner.receiver.drawMenuFont(engine, playerID, 0, y2, strTemp,
EventReceiver.COLOR_WHITE);
} else {
owner.receiver.drawDirectFont(engine, playerID, x + 4, y + 168,
strTemp, EventReceiver.COLOR_WHITE, 0.5f);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java Mon
Nov 26 09:39:55 2012
@@ -468,7 +468,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "PHANTOM MANIA",
EventReceiver.COLOR_WHITE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel.value == 0) &&
(!big.value) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Leaderboard
@@ -910,7 +910,7 @@

engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -942,7 +942,7 @@
receiver.drawMenuFont(engine, playerID, 0, 3, strGrade, gcolor);

drawResultStats(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_MANIA, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_MANIA,
Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, rankingRank);
if(secretGrade > 4) {
drawResult(engine, playerID, receiver, 15, EventReceiver.COLOR_BLUE,
@@ -971,7 +971,7 @@
if(medalCO >= 1) receiver.drawMenuFont(engine, playerID, 8, 5, "CO",
getMedalFontColor(medalCO));

drawResultStats(engine, playerID, receiver, 6, EventReceiver.COLOR_BLUE,
- STAT_LPM, STAT_SPM, STAT_PIECE, STAT_PPS);
+ Statistic.LPM, Statistic.SPM, Statistic.PIECE, Statistic.PPS);
}
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Mon Nov
26 09:39:55 2012
@@ -256,7 +256,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "PHYSICIAN",
EventReceiver.COLOR_DARKBLUE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (engine.ai == null)) {
receiver.drawScoreFont(engine, playerID, 3, 3, "SCORE TIME",
EventReceiver.COLOR_BLUE);
for(int i = 0; i < RANKING_MAX; i++) {
@@ -345,7 +345,7 @@
engine.gameEnded();
engine.timerActive = false;
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java Mon
Nov 26 09:39:55 2012
@@ -543,8 +543,8 @@
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -757,7 +757,7 @@
{
if (garbageCheck(engine, playerID))
{
- engine.stat = GameEngine.STAT_LINECLEAR;
+ engine.stat = GameEngine.Status.LINECLEAR;
engine.statc[0] = engine.getLineDelay();
}
}
@@ -869,13 +869,13 @@

// 決着
if((playerID == 1) && (owner.engine[0].gameActive)) {
- boolean p1Lose = (owner.engine[0].stat == GameEngine.STAT_GAMEOVER);
+ boolean p1Lose = (owner.engine[0].stat == GameEngine.Status.GAMEOVER);
if (!p1Lose && owner.engine[1].field != null)
{
rest[1] = owner.engine[1].field.getHowManyGems();
p1Lose = (rest[1] == 0);
}
- boolean p2Lose = (owner.engine[1].stat == GameEngine.STAT_GAMEOVER);
+ boolean p2Lose = (owner.engine[1].stat == GameEngine.Status.GAMEOVER);
if (!p2Lose && owner.engine[0].field != null)
{
rest[0] = owner.engine[0].field.getHowManyGems();
@@ -884,18 +884,18 @@
if(p1Lose && p2Lose) {
// Draw
winnerID = -1;
- owner.engine[0].stat = GameEngine.STAT_GAMEOVER;
- owner.engine[1].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[0].stat = GameEngine.Status.GAMEOVER;
+ owner.engine[1].stat = GameEngine.Status.GAMEOVER;
} else if(p2Lose && !p1Lose) {
// 1P win
winnerID = 0;
- owner.engine[0].stat = GameEngine.STAT_EXCELLENT;
- owner.engine[1].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[0].stat = GameEngine.Status.EXCELLENT;
+ owner.engine[1].stat = GameEngine.Status.GAMEOVER;
} else if(p1Lose && !p2Lose) {
// 2P win
winnerID = 1;
- owner.engine[0].stat = GameEngine.STAT_GAMEOVER;
- owner.engine[1].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[0].stat = GameEngine.Status.GAMEOVER;
+ owner.engine[1].stat = GameEngine.Status.EXCELLENT;
}
if (p1Lose || p2Lose) {
owner.engine[0].gameEnded();
@@ -924,7 +924,7 @@
}

drawResultStats(engine, playerID, receiver, 3,
EventReceiver.COLOR_ORANGE,
- STAT_LINES, STAT_PIECE, STAT_LPM, STAT_PPS, STAT_TIME);
+ Statistic.LINES, Statistic.PIECE, Statistic.LPM, Statistic.PPS,
Statistic.TIME);
/*
float apm = (float)(garbageSent[playerID] * 3600) /
(float)(engine.statistics.time);
drawResult(engine, playerID, receiver, 3, EventReceiver.COLOR_ORANGE,
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PracticeMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PracticeMode.java Mon Nov
26 09:39:55 2012
@@ -915,7 +915,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "PRACTICE",
EventReceiver.COLOR_YELLOW);

- if(engine.stat == GameEngine.STAT_FIELDEDIT) {
+ if(engine.stat == GameEngine.Status.FIELDEDIT) {
// fieldエディットのとき

// 座標
@@ -1108,7 +1108,7 @@
if(rolltime >= rolltimelimit) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
} else {
if((timelimitTimer > 0) && (engine.timerActive == true))
timelimitTimer--;
@@ -1118,8 +1118,8 @@
engine.gameEnded();
engine.timerActive = false;
engine.resetStatc();
- if(goallv == -1) engine.stat = GameEngine.STAT_ENDINGSTART;
- else engine.stat = GameEngine.STAT_GAMEOVER;
+ if(goallv == -1) engine.stat = GameEngine.Status.ENDINGSTART;
+ else engine.stat = GameEngine.Status.GAMEOVER;
}

// 10秒前からのカウントダウン
@@ -1587,7 +1587,7 @@
@Override
public void renderResult(GameEngine engine, int playerID) {
drawResultStats(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_ADD_DISP, STAT_TIME, STAT_SPL,
STAT_SPM, STAT_LPM);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_ADD_DISP,
Statistic.TIME, Statistic.SPL, Statistic.SPM, Statistic.LPM);
if(secretGrade > 0) {
drawResult(engine, playerID, receiver, 14, EventReceiver.COLOR_BLUE,
"S. GRADE", String.format("%10s",
tableSecretGradeName[secretGrade-1]));
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java Mon Nov
26 09:39:55 2012
@@ -298,7 +298,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "RETRO MANIA",
EventReceiver.COLOR_GREEN);
receiver.drawScoreFont(engine, playerID, 0,
1, "("+GAMETYPE_NAME[gametype]+" SPEED)", EventReceiver.COLOR_GREEN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
// Leaderboard
if((owner.replayMode == false) && (big == false) && (startlevel == 0)
&& (engine.ai == null)) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
@@ -445,7 +445,7 @@
receiver.drawMenuFont(engine, playerID, 0, 1, "PLAY DATA",
EventReceiver.COLOR_ORANGE);

drawResultStats(engine, playerID, receiver, 3, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL, Statistic.TIME);
drawResultRank(engine, playerID, receiver, 11, EventReceiver.COLOR_BLUE,
rankingRank);
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java Mon
Nov 26 09:39:55 2012
@@ -346,7 +346,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "RETRO MARATHON",
EventReceiver.COLOR_GREEN);
receiver.drawScoreFont(engine, playerID, 0,
1, "("+GAMETYPE_NAME[gametype]+")", EventReceiver.COLOR_GREEN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (big == false) && (engine.ai ==
null)) {
receiver.drawScoreFont(engine, playerID, 3, 3, "SCORE LINE LV.",
EventReceiver.COLOR_BLUE);

@@ -505,12 +505,12 @@
receiver.drawMenuFont(engine, playerID, 0, 1, "PLAY DATA",
EventReceiver.COLOR_ORANGE);

drawResultStats(engine, playerID, receiver, 3, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES);
+ Statistic.SCORE, Statistic.LINES);
receiver.drawMenuFont(engine, playerID, 0, 7, "LEVEL",
EventReceiver.COLOR_BLUE);
String strLevel = String.format("%10s",
LEVEL_NAME[engine.statistics.level]);
receiver.drawMenuFont(engine, playerID, 0, 8, strLevel);
drawResultStats(engine, playerID, receiver, 9, EventReceiver.COLOR_BLUE,
- STAT_TIME, STAT_SPL, STAT_LPM);
+ Statistic.TIME, Statistic.SPL, Statistic.LPM);
drawResultRank(engine, playerID, receiver, 15, EventReceiver.COLOR_BLUE,
rankingRank);

}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMasteryMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMasteryMode.java Mon
Nov 26 09:39:55 2012
@@ -334,7 +334,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "RETRO MASTERY",
EventReceiver.COLOR_GREEN);
receiver.drawScoreFont(engine, playerID, 0,
1, "("+GAMETYPE_NAME[gametype]+")", EventReceiver.COLOR_GREEN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (big == false) && (engine.ai ==
null)) {
receiver.drawScoreFont(engine, playerID, 3, 3, "SCORE LINE LV.",
EventReceiver.COLOR_BLUE);

@@ -493,7 +493,7 @@
public void renderResult(GameEngine engine, int playerID) {
receiver.drawMenuFont(engine, playerID, 0, 1, "PLAY DATA",
EventReceiver.COLOR_ORANGE);

- drawResultStats(engine, playerID, receiver, 3, EventReceiver.COLOR_BLUE,
STAT_SCORE);
+ drawResultStats(engine, playerID, receiver, 3, EventReceiver.COLOR_BLUE,
Statistic.SCORE);

receiver.drawMenuFont(engine, playerID, 0, 5, "LINES",
EventReceiver.COLOR_BLUE);
String strLines = String.format("%10d", loons);
@@ -502,7 +502,7 @@
receiver.drawMenuFont(engine, playerID, 0, 7, strFour);

drawResultStats(engine, playerID, receiver, 8, EventReceiver.COLOR_BLUE,
- STAT_LEVEL, STAT_TIME);
+ Statistic.LEVEL, Statistic.TIME);
drawResult(engine, playerID, receiver, 12, EventReceiver.COLOR_BLUE,
"EFFICIENCY", String.format("%10.3f", efficiency));
drawResultRank(engine, playerID, receiver, 14, EventReceiver.COLOR_BLUE,
rankingRank);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java Mon Nov 26
08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java Mon Nov 26
09:39:55 2012
@@ -769,8 +769,8 @@
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -1524,27 +1524,27 @@

// 決着
if((playerID == 1) && (owner.engine[0].gameActive)) {
- if((owner.engine[0].stat == GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat == GameEngine.STAT_GAMEOVER)) {
+ if((owner.engine[0].stat == GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat == GameEngine.Status.GAMEOVER)) {
// Draw
winnerID = -1;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
- } else if((owner.engine[0].stat != GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat == GameEngine.STAT_GAMEOVER)) {
+ } else if((owner.engine[0].stat != GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat == GameEngine.Status.GAMEOVER)) {
// 1P win
winnerID = 0;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
- owner.engine[0].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[0].stat = GameEngine.Status.EXCELLENT;
owner.engine[0].resetStatc();
owner.engine[0].statc[1] = 1;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
- } else if((owner.engine[0].stat == GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat != GameEngine.STAT_GAMEOVER)) {
+ } else if((owner.engine[0].stat == GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat != GameEngine.Status.GAMEOVER)) {
// 2P win
winnerID = 1;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
- owner.engine[1].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[1].stat = GameEngine.Status.EXCELLENT;
owner.engine[1].resetStatc();
owner.engine[1].statc[1] = 1;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
@@ -1570,11 +1570,11 @@
drawResult(engine, playerID, receiver, 3, EventReceiver.COLOR_ORANGE,
"ATTACK", String.format("%10d", ojamaSent[playerID]));
drawResultStats(engine, playerID, receiver, 5,
EventReceiver.COLOR_ORANGE,
- STAT_LINES, STAT_PIECE);
+ Statistic.LINES, Statistic.PIECE);
drawResult(engine, playerID, receiver, 9, EventReceiver.COLOR_ORANGE,
"ATTACK/MIN", String.format("%10g", apm));
drawResultStats(engine, playerID, receiver, 11,
EventReceiver.COLOR_ORANGE,
- STAT_LPM, STAT_PPS, STAT_TIME);
+ Statistic.LPM, Statistic.PPS, Statistic.TIME);
}

/*
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java Mon
Nov 26 09:39:55 2012
@@ -395,7 +395,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "SCORE ATTACK",
EventReceiver.COLOR_DARKBLUE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (always20g == false) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Score Leaderboard
@@ -661,7 +661,7 @@
if(rolltime >= ROLLTIMELIMIT) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -686,7 +686,7 @@

if(engine.statc[1] == 0) {
drawResultStats(engine, playerID, receiver, 2, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL, Statistic.TIME);
drawResultRank(engine, playerID, receiver, 13,
EventReceiver.COLOR_BLUE, rankingRank);
if(secretGrade > 4) {
drawResult(engine, playerID, receiver, 15, EventReceiver.COLOR_BLUE,
@@ -707,7 +707,7 @@
}
} else if(engine.statc[1] == 2) {
drawResultStats(engine, playerID, receiver, 2, EventReceiver.COLOR_BLUE,
- STAT_LPM, STAT_SPM, STAT_PIECE, STAT_PPS);
+ Statistic.LPM, Statistic.SPM, Statistic.PIECE, Statistic.PPS);
}
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java Mon Nov
26 09:39:55 2012
@@ -490,7 +490,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "SCORE RACE",
EventReceiver.COLOR_RED);
receiver.drawScoreFont(engine, playerID, 0, 1, "(" +
GOAL_TABLE[goaltype] + " PTS GAME)", EventReceiver.COLOR_RED);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if(!owner.replayMode && !big && (engine.ai == null) && !netIsWatch) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 6 : 4;
@@ -754,7 +754,7 @@
if((engine.statistics.score >= GOAL_TABLE[goaltype]) &&
(engine.timerActive == true)) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
}

// BGM fadeout
@@ -774,13 +774,13 @@

if(engine.statc[1] == 0) {
drawResultStats(engine, playerID, receiver, 2, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_TIME, STAT_PIECE);
+ Statistic.SCORE, Statistic.LINES, Statistic.TIME, Statistic.PIECE);
drawResultRank(engine, playerID, receiver, 10,
EventReceiver.COLOR_BLUE, rankingRank);
drawResultNetRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 14,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
} else if(engine.statc[1] == 1) {
drawResultStats(engine, playerID, receiver, 2, EventReceiver.COLOR_BLUE,
- STAT_SPL, STAT_SPM, STAT_LPM, STAT_PPS);
+ Statistic.SPL, Statistic.SPM, Statistic.LPM, Statistic.PPS);
}

if(netIsPB) {
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java Mon
Nov 26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java Mon
Nov 26 09:39:55 2012
@@ -532,7 +532,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "SPEED MANIA 2",
EventReceiver.COLOR_RED);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Rankings
@@ -994,7 +994,7 @@
rollclear = 2;
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
}
}
@@ -1027,7 +1027,7 @@
receiver.drawMenuFont(engine, playerID, 0, 3, strGrade, gcolor);

drawResultStats(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_MANIA, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_MANIA,
Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, rankingRank);
if(secretGrade > 4) {
drawResult(engine, playerID, receiver, 14, EventReceiver.COLOR_BLUE,
@@ -1054,7 +1054,7 @@
if(medalCO >= 1) receiver.drawMenuFont(engine, playerID, 8, 4, "CO",
getMedalFontColor(medalCO));

drawResultStats(engine, playerID, receiver, 6, EventReceiver.COLOR_BLUE,
- STAT_LPM, STAT_SPM, STAT_PIECE, STAT_PPS);
+ Statistic.LPM, Statistic.SPM, Statistic.PIECE, Statistic.PPS);
}
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java Mon Nov
26 09:39:55 2012
@@ -452,7 +452,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "SPEED MANIA",
EventReceiver.COLOR_RED);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel.value == 0) && (big.value
== false) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Rankings
@@ -883,7 +883,7 @@
if(rolltime >= ROLLTIMELIMIT) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -914,7 +914,7 @@
}

drawResultStats(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL_MANIA, STAT_TIME);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL_MANIA,
Statistic.TIME);
drawResultRank(engine, playerID, receiver, 12,
EventReceiver.COLOR_BLUE, rankingRank);
if(secretGrade > 4) {
drawResult(engine, playerID, receiver, 14, EventReceiver.COLOR_BLUE,
@@ -943,7 +943,7 @@
if(medalCO >= 1) receiver.drawMenuFont(engine, playerID, 8, 5, "CO",
getMedalFontColor(medalCO));

drawResultStats(engine, playerID, receiver, 6, EventReceiver.COLOR_BLUE,
- STAT_LPM, STAT_SPM, STAT_PIECE, STAT_PPS);
+ Statistic.LPM, Statistic.SPM, Statistic.PIECE, Statistic.PPS);
}
}

=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Mon Nov 26
08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Mon Nov 26
09:39:55 2012
@@ -310,7 +310,7 @@
public void renderLast(GameEngine engine, int playerID) {
receiver.drawScoreFont(engine, playerID, 0, 0, "SQUARE
("+GAMETYPE_NAME[gametype]+")", EventReceiver.COLOR_DARKBLUE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (engine.ai == null)) {
float scale = ((receiver.getNextDisplayType() == 2) && (gametype ==
0)) ? 0.5f : 1.0f;
int topY = ((receiver.getNextDisplayType() == 2) && (gametype == 0)) ?
6 : 4;
@@ -401,7 +401,7 @@
if((engine.statistics.time >= ULTRA_MAX_TIME) && (engine.timerActive ==
true)) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
return;
}
} else if (gametype == 2) {
@@ -417,7 +417,7 @@
if((engine.statistics.score >= SPRINT_MAX_SCORE) && (engine.timerActive
== true)) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
}
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java Mon Nov
26 09:39:55 2012
@@ -466,7 +466,7 @@

receiver.drawScoreFont(engine, playerID, 0, 0, "TECHNICIAN\n(" +
GAMETYPE_NAME[goaltype] + ")", EventReceiver.COLOR_WHITE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (big == false) && (startlevel == 0)
&& (engine.ai == null)) {
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
int topY = (receiver.getNextDisplayType() == 2) ? 6 : 4;
@@ -637,7 +637,7 @@
if((goaltype == GAMETYPE_LV15_HARD) || (goaltype ==
GAMETYPE_10MIN_HARD)) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
} else if(goaltype == GAMETYPE_10MIN_EASY) {
regretdispframe = 180;
engine.playSE("regret");
@@ -671,9 +671,9 @@
engine.resetStatc();

if((goaltype == GAMETYPE_10MIN_EASY) || (goaltype ==
GAMETYPE_10MIN_HARD)) {
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
} else {
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
}

totalTimer = 0;
@@ -706,7 +706,7 @@

engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -922,7 +922,7 @@
@Override
public void renderResult(GameEngine engine, int playerID) {
drawResultStats(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE,
- STAT_SCORE, STAT_LINES, STAT_LEVEL, STAT_TIME, STAT_SPL, STAT_LPM);
+ Statistic.SCORE, Statistic.LINES, Statistic.LEVEL, Statistic.TIME,
Statistic.SPL, Statistic.LPM);
drawResultRank(engine, playerID, receiver, 12, EventReceiver.COLOR_BLUE,
rankingRank);
drawResultNetRank(engine, playerID, receiver, 14,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 16,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java Mon Nov
26 09:39:55 2012
@@ -612,7 +612,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "TIME ATTACK",
EventReceiver.COLOR_PURPLE);
receiver.drawScoreFont(engine, playerID, 0,
1, "("+GAMETYPE_NAME_LONG[goaltype]+")", EventReceiver.COLOR_PURPLE);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (engine.ai == null) && (!netIsWatch)) {
receiver.drawScoreFont(engine, playerID, 3, 3, "LINE TIME",
EventReceiver.COLOR_BLUE);

@@ -738,7 +738,7 @@
} else if(!netIsWatch) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_GAMEOVER;
+ engine.stat = GameEngine.Status.GAMEOVER;
}
}

@@ -791,7 +791,7 @@
engine.statistics.rollclear = 2;
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_EXCELLENT;
+ engine.stat = GameEngine.Status.EXCELLENT;
}
}
}
@@ -894,7 +894,7 @@
receiver.drawMenuFont(engine, playerID, 0, 3, strLines, gcolor);

drawResultStats(engine, playerID, receiver, 4, EventReceiver.COLOR_BLUE,
- STAT_LEVEL, STAT_TIME, STAT_PIECE, STAT_LPM, STAT_PPS);
+ Statistic.LEVEL, Statistic.TIME, Statistic.PIECE, Statistic.LPM,
Statistic.PPS);
drawResultRank(engine, playerID, receiver, 14,
EventReceiver.COLOR_BLUE, rankingRank);
drawResultNetRank(engine, playerID, receiver, 16,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 18,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java Mon Nov 26
08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java Mon Nov 26
09:39:55 2012
@@ -477,7 +477,7 @@
receiver.drawScoreFont(engine, playerID, 0, 0, "ULTRA",
EventReceiver.COLOR_CYAN);
receiver.drawScoreFont(engine, playerID, 0, 1, "(" + (goaltype + 1) + "
MINUTE GAME)", EventReceiver.COLOR_CYAN);

- if( (engine.stat == GameEngine.STAT_SETTING) || ((engine.stat ==
GameEngine.STAT_RESULT) && (owner.replayMode == false)) ) {
+ if( (engine.stat == GameEngine.Status.SETTING) || ((engine.stat ==
GameEngine.Status.RESULT) && (owner.replayMode == false)) ) {
if((owner.replayMode == false) && (big == false) && (engine.ai ==
null)) {
receiver.drawScoreFont(engine, playerID, 0, 3, "SCORE RANKING",
EventReceiver.COLOR_GREEN);
receiver.drawScoreFont(engine, playerID, 3, 4, "SCORE LINE",
EventReceiver.COLOR_BLUE);
@@ -748,7 +748,7 @@
if(engine.statistics.time >= limitTime) {
engine.gameEnded();
engine.resetStatc();
- engine.stat = GameEngine.STAT_ENDINGSTART;
+ engine.stat = GameEngine.Status.ENDINGSTART;
return;
}

@@ -779,20 +779,20 @@
*/
@Override
public void renderResult(GameEngine engine, int playerID) {
- drawResultStats(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE,
STAT_SCORE);
+ drawResultStats(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE,
Statistic.SCORE);
if(rankingRank[0] != -1) {
String strRank = String.format("RANK %d", rankingRank[0] + 1);
receiver.drawMenuFont(engine, playerID, 4, 2, strRank,
EventReceiver.COLOR_ORANGE);
}

- drawResultStats(engine, playerID, receiver, 3, EventReceiver.COLOR_BLUE,
STAT_LINES);
+ drawResultStats(engine, playerID, receiver, 3, EventReceiver.COLOR_BLUE,
Statistic.LINES);
if(rankingRank[1] != -1) {
String strRank = String.format("RANK %d", rankingRank[1] + 1);
receiver.drawMenuFont(engine, playerID, 4, 5, strRank,
EventReceiver.COLOR_ORANGE);
}

drawResultStats(engine, playerID, receiver, 6, EventReceiver.COLOR_BLUE,
- STAT_PIECE, STAT_SPL, STAT_SPM, STAT_LPM, STAT_PPS);
+ Statistic.PIECE, Statistic.SPL, Statistic.SPM, Statistic.LPM,
Statistic.PPS);

drawResultNetRank(engine, playerID, receiver, 16,
EventReceiver.COLOR_BLUE, netRankingRank[0]);
drawResultNetRankDaily(engine, playerID, receiver, 18,
EventReceiver.COLOR_BLUE, netRankingRank[1]);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSBattleMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSBattleMode.java Mon Nov
26 09:39:55 2012
@@ -670,8 +670,8 @@
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -1222,28 +1222,28 @@

// 決着
if((playerID == 1) && (owner.engine[0].gameActive)) {
- if((owner.engine[0].stat == GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat == GameEngine.STAT_GAMEOVER)) {
+ if((owner.engine[0].stat == GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat == GameEngine.Status.GAMEOVER)) {
// Draw
winnerID = -1;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
- } else if((owner.engine[0].stat != GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat == GameEngine.STAT_GAMEOVER)) {
+ } else if((owner.engine[0].stat != GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat == GameEngine.Status.GAMEOVER)) {
// 1P win
winnerID = 0;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
- owner.engine[0].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[0].stat = GameEngine.Status.EXCELLENT;
owner.engine[0].resetStatc();
owner.engine[0].statc[1] = 1;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
if(!owner.replayMode) winCount[0]++;
- } else if((owner.engine[0].stat == GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat != GameEngine.STAT_GAMEOVER)) {
+ } else if((owner.engine[0].stat == GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat != GameEngine.Status.GAMEOVER)) {
// 2P win
winnerID = 1;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
- owner.engine[1].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[1].stat = GameEngine.Status.EXCELLENT;
owner.engine[1].resetStatc();
owner.engine[1].statc[1] = 1;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
@@ -1273,13 +1273,13 @@
drawResult(engine, playerID, receiver, 2, EventReceiver.COLOR_ORANGE,
"ATTACK", String.format("%10d", garbageSent[playerID]));
drawResultStats(engine, playerID, receiver, 4,
EventReceiver.COLOR_ORANGE,
- STAT_LINES, STAT_PIECE);
+ Statistic.LINES, Statistic.PIECE);
drawResult(engine, playerID, receiver, 8, EventReceiver.COLOR_ORANGE,
"ATK/LINE", String.format("%10g", apl));
drawResult(engine, playerID, receiver, 10, EventReceiver.COLOR_ORANGE,
"ATTACK/MIN", String.format("%10g", apm));
drawResultStats(engine, playerID, receiver, 12,
EventReceiver.COLOR_ORANGE,
- STAT_LPM, STAT_PPS, STAT_TIME);
+ Statistic.LPM, Statistic.PPS, Statistic.TIME);
}

/*
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSDigRaceMode.java Mon Nov
26 08:57:10 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSDigRaceMode.java Mon Nov
26 09:39:55 2012
@@ -287,8 +287,8 @@
} else {
// Start the game when both players are ready
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
- owner.engine[0].stat = GameEngine.STAT_READY;
- owner.engine[1].stat = GameEngine.STAT_READY;
+ owner.engine[0].stat = GameEngine.Status.READY;
+ owner.engine[1].stat = GameEngine.Status.READY;
owner.engine[0].resetStatc();
owner.engine[1].resetStatc();
}
@@ -536,7 +536,7 @@
// Game completed
if((lines > 0) && (remainLines <= 0)) {
engine.timerActive = false;
- owner.engine[enemyID].stat = GameEngine.STAT_GAMEOVER;
+ owner.engine[enemyID].stat = GameEngine.Status.GAMEOVER;
owner.engine[enemyID].resetStatc();
}
}
@@ -545,28 +545,28 @@
public void onLast(GameEngine engine, int playerID) {
// Game End
if((playerID == 1) && (owner.engine[0].gameActive)) {
- if((owner.engine[0].stat == GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat == GameEngine.STAT_GAMEOVER)) {
+ if((owner.engine[0].stat == GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat == GameEngine.Status.GAMEOVER)) {
// Draw
winnerID = -1;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
- } else if((owner.engine[0].stat != GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat == GameEngine.STAT_GAMEOVER)) {
+ } else if((owner.engine[0].stat != GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat == GameEngine.Status.GAMEOVER)) {
// 1P win
winnerID = 0;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
- owner.engine[0].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[0].stat = GameEngine.Status.EXCELLENT;
owner.engine[0].resetStatc();
owner.engine[0].statc[1] = 1;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
if(!owner.replayMode) winCount[0]++;
- } else if((owner.engine[0].stat == GameEngine.STAT_GAMEOVER) &&
(owner.engine[1].stat != GameEngine.STAT_GAMEOVER)) {
+ } else if((owner.engine[0].stat == GameEngine.Status.GAMEOVER) &&
(owner.engine[1].stat != GameEngine.Status.GAMEOVER)) {
// 2P win
winnerID = 1;
owner.engine[0].gameEnded();
owner.engine[1].gameEnded();
- owner.engine[1].stat = GameEngine.STAT_EXCELLENT;
+ owner.engine[1].stat = GameEngine.Status.EXCELLENT;
owner.engine[1].resetStatc();
owner.engine[1].statc[1] = 1;
owner.bgmStatus.bgm = BGMStatus.BGM_NOTHING;
@@ -589,7 +589,7 @@
receiver.drawMenuFont(engine, playerID, 6, 1, "LOSE",
EventReceiver.COLOR_WHITE);
}
drawResultStats(engine, playerID, receiver, 2,
EventReceiver.COLOR_ORANGE,
- STAT_LINES, STAT_PIECE, STAT_LPM, STAT_PPS, STAT_TIME);
+ Statistic.LINES, Statistic.PIECE, Statistic.LPM, Statistic.PPS,
Statistic.TIME);
}

/*
=======================================
***Additional files exist in this changeset.***