[nullpomino] r906 committed - Begin phasing out uses of engine.statc. (NOTE: I did a couple Replace ...
3 views
Skip to first unread message
nullp...@googlecode.com
Nov 26, 2012, 11:59:03 AM11/26/12
to nullpom...@googlegroups.com
Revision: 906
Author: Pooch...@gmail.com
Date: Mon Nov 26 08:57:10 2012
Log: Begin phasing out uses of engine.statc. (NOTE: I did a couple
Replace All operations in all mode classes: "engine.statc[2]"
-> "menuCursor" and "engine.statc[3]" -> "menuTime". These are untested!)
http://code.google.com/p/nullpomino/source/detail?r=906
Added:
/trunk/src/mu/nu/nullpo/game/subsystem/mode/menu/TimeMenuItem.java
Modified:
/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/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/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/ToolVSMapEditMode.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/mu/nu/nullpo/game/subsystem/mode/menu/AbstractMenuItem.java
=======================================
--- /dev/null
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/menu/TimeMenuItem.java Mon
Nov 26 08:57:10 2012
@@ -0,0 +1,34 @@
+package mu.nu.nullpo.game.subsystem.mode.menu;
+
+import mu.nu.nullpo.util.GeneralUtil;
+
+public class TimeMenuItem extends IntegerMenuItem {
+ public int increment;
+
+ public TimeMenuItem(String name, String displayName, int color,
+ int defaultValue, int min, int max) {
+ super(name, displayName, color, defaultValue, min, max);
+ increment = 60;
+ }
+
+ public TimeMenuItem(String name, String displayName, int color,
+ int defaultValue, int min, int max, int increment) {
+ super(name, displayName, color, defaultValue, min, max);
+ this.increment = increment;
+ }
+
+ @Override
+ public void change(int dir, int fast) {
+ int delta = dir * increment;
+ value += delta;
+ if (value < min)
+ value = max;
+ if (value > max)
+ value = min;
+ }
+
+ @Override
+ public String getValueString() {
+ return GeneralUtil.getTime(value);
+ }
+}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AbstractMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AbstractMode.java Mon Nov
26 08:57:10 2012
@@ -64,9 +64,17 @@
/** Name of mode in properties file */
protected String propName;
+
+ /** Position of cursor in menu */
+ protected int menuCursor;
+
+ /** Number of frames spent in menu */
+ protected int menuTime;
public AbstractMode() {
statcMenu = 0;
+ menuCursor = 0;
+ menuTime = 0;
menuColor = EventReceiver.COLOR_WHITE;
menuY = 0;
menu = new ArrayList<AbstractMenuItem>();
@@ -220,14 +228,14 @@
public void renderSetting(GameEngine engine, int playerID) {
//TODO: Custom page breaks
AbstractMenuItem menuItem;
- int pageNum = engine.statc[2] / 10;
+ int pageNum = menuCursor / 10;
int pageStart = pageNum * 10;
int endPage = Math.min(menu.size(), pageStart+10);
for (int i = pageStart; i < endPage; i++)
{
menuItem = menu.get(i);
receiver.drawMenuFont(engine, playerID, 0, i << 1,
menuItem.displayName, menuItem.color);
- if (engine.statc[2] == i && !engine.owner.replayMode)
+ if (menuCursor == i && !engine.owner.replayMode)
receiver.drawMenuFont(engine, playerID, 0, (i << 1) + 1, "b" +
menuItem.getValueString(), true);
else
receiver.drawMenuFont(engine, playerID, 1, (i << 1) + 1,
menuItem.getValueString());
@@ -280,14 +288,14 @@
protected int updateCursor (GameEngine engine, int maxCursor, int
playerID) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = maxCursor;
+ menuCursor--;
+ if(menuCursor < 0) menuCursor = maxCursor;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > maxCursor) engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > maxCursor) menuCursor = 0;
engine.playSE("cursor");
}
@@ -306,7 +314,7 @@
int fast = 0;
if (engine.ctrl.isPush(Controller.BUTTON_E)) fast++;
if (engine.ctrl.isPush(Controller.BUTTON_F)) fast += 2;
- menu.get(engine.statc[2]).change(change, fast);
+ menu.get(menuCursor).change(change, fast);
}
}
@@ -327,7 +335,7 @@
{
if ((i&1) == 0)
receiver.drawMenuFont(engine, playerID, 0, menuY, str[i], menuColor);
- else if (engine.statc[2] == statcMenu && !engine.owner.replayMode)
+ else if (menuCursor == statcMenu && !engine.owner.replayMode)
{
receiver.drawMenuFont(engine, playerID, 0, menuY, "b" + str[i], true);
statcMenu++;
@@ -352,7 +360,7 @@
for (int i = 0; i < str.length-1; i+= 2)
{
receiver.drawMenuFont(engine, playerID, 1, menuY, str[i] + ":",
menuColor);
- if (engine.statc[2] == statcMenu && !engine.owner.replayMode)
+ if (menuCursor == statcMenu && !engine.owner.replayMode)
{
receiver.drawMenuFont(engine, playerID, 0, menuY, "b", true);
receiver.drawMenuFont(engine, playerID, str[i].length()+2, menuY,
str[i+1], true);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java Mon
Nov 26 08:57:10 2012
@@ -199,7 +199,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
case 6:
@@ -278,14 +278,14 @@
}
if (engine.ctrl.isPush(Controller.BUTTON_A)) {
- if ((xyzzy == 573) && engine.statc[2] > 5) {
+ if ((xyzzy == 573) && menuCursor > 5) {
loadMapSetFever(engine, playerID, mapSet, true);
loadFeverMap(engine, new Random(), previewChain, previewSubset);
} else if (xyzzy == 9) {
engine.playSE("levelup");
xyzzy = 573;
loadMapSetFever(engine, playerID, mapSet, true);
- } else if (engine.statc[3] >= 5) {
+ } else if (menuTime >= 5) {
// 決定
engine.playSE("decide");
saveSetting(owner.modeConfig);
@@ -303,12 +303,12 @@
}
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
@@ -331,7 +331,7 @@
*/
@Override
public void renderSetting(GameEngine engine, int playerID) {
- if (engine.statc[2] <= 5) {
+ if (menuCursor <= 5) {
String strOutline = "";
if(outlinetype == 0) strOutline = "NORMAL";
if(outlinetype == 1) strOutline = "COLOR";
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java Mon Nov
26 08:57:10 2012
@@ -157,16 +157,16 @@
if(engine.owner.replayMode == false) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = 10;
- else if(engine.statc[2] == 1 && gametype != 2) engine.statc[2]--;
+ menuCursor--;
+ if(menuCursor < 0) menuCursor = 10;
+ else if(menuCursor == 1 && gametype != 2) menuCursor--;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 10) engine.statc[2] = 0;
- else if(engine.statc[2] == 1 && gametype != 2) engine.statc[2]++;
+ menuCursor++;
+ if(menuCursor > 10) menuCursor = 0;
+ else if(menuCursor == 1 && gametype != 2) menuCursor++;
engine.playSE("cursor");
}
@@ -178,7 +178,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
@@ -229,7 +229,7 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -241,14 +241,14 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
- else if(engine.statc[3] >= 120)
+ if(menuTime >= 60)
+ menuCursor = 9;
+ else if(menuTime >= 120)
return false;
}
@@ -260,7 +260,7 @@
*/
@Override
public void renderSetting(GameEngine engine, int playerID) {
- if (engine.statc[2] <= 8) {
+ if (menuCursor <= 8) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
"GAME TYPE", GAMETYPE_NAME[gametype]);
if (gametype == 2)
=======================================
---
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
Sat Nov 10 01:22:14 2012
+++
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
Mon Nov 26 08:57:10 2012
@@ -133,7 +133,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -308,12 +308,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 32) {
+ if(menuCursor == 32) {
loadPreset(engine, owner.modeConfig,
presetNumber[playerID], "bombbattle");
- } else if(engine.statc[2] == 33) {
+ } else if(menuCursor == 33) {
savePreset(engine, owner.modeConfig,
presetNumber[playerID], "bombbattle");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -330,32 +330,32 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 240)
+ if(menuTime >= 240)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 180)
- engine.statc[2] = 26;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 17;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 180)
+ menuCursor = 26;
+ else if(menuTime >= 120)
+ menuCursor = 17;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -379,7 +379,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -392,7 +392,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/4",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 17) {
+ } else if(menuCursor < 17) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"COUNTER", OJAMA_COUNTER_STRING[ojamaCounterMode[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
@@ -404,7 +404,7 @@
"HARD OJAMA", String.valueOf(ojamaHard[playerID]));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 2/4",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 26) {
+ } else if(menuCursor < 26) {
initMenu(EventReceiver.COLOR_CYAN, 17);
drawMenu(engine, playerID, receiver,
"X COLUMN", dangerColumnDouble[playerID] ? "3 AND 4" : "3 ONLY",
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Sat Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Mon Nov 26 08:57:10 2012
@@ -131,7 +131,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -269,12 +269,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 27) {
+ if(menuCursor == 27) {
loadPreset(engine, owner.modeConfig,
presetNumber[playerID], "digrace");
- } else if(engine.statc[2] == 28) {
+ } else if(menuCursor == 28) {
savePreset(engine, owner.modeConfig,
presetNumber[playerID], "digrace");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -289,17 +289,17 @@
if(engine.ctrl.isPush(Controller.BUTTON_B)) {
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 180)
+ if(menuTime >= 180)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 18;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 120)
+ menuCursor = 18;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -323,7 +323,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -336,7 +336,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/3",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 18) {
+ } else if(menuCursor < 18) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"COUNTER", OJAMA_COUNTER_STRING[ojamaCounterMode[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
Sat Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
Mon Nov 26 08:57:10 2012
@@ -155,7 +155,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -305,12 +305,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 28) {
+ if(menuCursor == 28) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID], "fever");
- } else if(engine.statc[2] == 29) {
+ } else if(menuCursor == 29) {
savePreset(engine, owner.modeConfig, presetNumber[playerID], "fever");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -325,19 +325,19 @@
if(engine.ctrl.isPush(Controller.BUTTON_B)) {
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 240)
+ if(menuTime >= 240)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 180)
- engine.statc[2] = 24;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 18;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 180)
+ menuCursor = 24;
+ else if(menuTime >= 120)
+ menuCursor = 18;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -361,7 +361,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -374,7 +374,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/4",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 18) {
+ } else if(menuCursor < 18) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"ZENKESHI", ZENKESHI_TYPE_NAMES[zenKeshiType[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
@@ -387,7 +387,7 @@
"X SHOW", GeneralUtil.getONorOFF(dangerColumnShowX[playerID]));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 2/4",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 25) {
+ } else if(menuCursor < 25) {
initMenu(EventReceiver.COLOR_PURPLE, 18);
drawMenu(engine, playerID, receiver,
"HANDICAP", String.valueOf(ojamaHandicap[playerID]),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java Mon
Nov 26 08:57:10 2012
@@ -277,7 +277,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -569,17 +569,17 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if ((xyzzy == 573) && engine.statc[2] > 43) {
+ if ((xyzzy == 573) && menuCursor > 43) {
loadFeverMap(engine, playerID, new Random(), previewChain[playerID],
previewSubset[playerID]);
} else if (xyzzy == 9 && playerID == 0) {
engine.playSE("levelup");
xyzzy = 573;
- } else if(engine.statc[2] == 42) {
+ } else if(menuCursor == 42) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID], "");
- } else if(engine.statc[2] == 43) {
+ } else if(menuCursor == 43) {
savePreset(engine, owner.modeConfig, presetNumber[playerID], "");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -600,34 +600,34 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 300)
+ if(menuTime >= 300)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 240)
- engine.statc[2] = 36;
- else if(engine.statc[3] >= 180)
- engine.statc[2] = 26;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 17;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 240)
+ menuCursor = 36;
+ else if(menuTime >= 180)
+ menuCursor = 26;
+ else if(menuTime >= 120)
+ menuCursor = 17;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -651,7 +651,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -664,7 +664,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 21, "PAGE 1/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 17) {
+ } else if(menuCursor < 17) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"COUNTER", OJAMA_COUNTER_STRING[ojamaCounterMode[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
@@ -676,7 +676,7 @@
"CHAINPOWER", newChainPower[playerID] ? "FEVER" : "CLASSIC");
receiver.drawMenuFont(engine, playerID, 0, 21, "PAGE 2/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 26) {
+ } else if(menuCursor < 26) {
initMenu(EventReceiver.COLOR_DARKBLUE, 17);
drawMenu(engine, playerID, receiver,
"OUTLINE", OUTLINE_TYPE_NAMES[outlineType[playerID]],
@@ -697,7 +697,7 @@
"ZK-BONUS", (zenKeshiType[playerID] == ZENKESHI_MODE_FEVER) ?
zenKeshiChain[playerID] + " CHAIN" : zenKeshiOjama[playerID] + "
OJAMA");
receiver.drawMenuFont(engine, playerID, 0, 21, "PAGE 3/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 36) {
+ } else if(menuCursor < 36) {
initMenu(big[playerID] ? EventReceiver.COLOR_WHITE :
EventReceiver.COLOR_PURPLE, 26);
drawMenu(engine, playerID, receiver,
"FEVER", (feverThreshold[playerID] == 0) ? "NONE" :
feverThreshold[playerID]+" PTS");
@@ -718,7 +718,7 @@
"SIDE METER", (ojamaMeter[playerID] || feverThreshold[playerID] ==
0) ? "OJAMA" : "FEVER");
receiver.drawMenuFont(engine, playerID, 0, 21, "PAGE 4/5",
EventReceiver.COLOR_YELLOW);
- } else if (engine.statc[2] < 44){
+ } else if (menuCursor < 44){
initMenu(EventReceiver.COLOR_PINK, 36);
drawMenu(engine, playerID, receiver,
"USE MAP", GeneralUtil.getONorOFF(useMap[playerID]),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java Mon
Nov 26 08:57:10 2012
@@ -291,23 +291,23 @@
// Configuration changes
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0){
- engine.statc[2] = 33;
+ menuCursor--;
+ if(menuCursor < 0){
+ menuCursor = 33;
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
}
- else if (engine.statc[2] == 31)
+ else if (menuCursor == 31)
engine.field = null;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 33) {
- engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > 33) {
+ menuCursor = 0;
engine.field = null;
}
- else if (engine.statc[2] == 32)
+ else if (menuCursor == 32)
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
engine.playSE("cursor");
}
@@ -324,7 +324,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -502,12 +502,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 30) {
+ if(menuCursor == 30) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID], "spf");
- } else if(engine.statc[2] == 31) {
+ } else if(menuCursor == 31) {
savePreset(engine, owner.modeConfig, presetNumber[playerID], "spf");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -524,37 +524,37 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 300)
+ if(menuTime >= 300)
engine.statc[4] = 1;
- else if (engine.statc[3] == 240)
+ else if (menuTime == 240)
{
- engine.statc[2] = 32;
+ menuCursor = 32;
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
}
- else if(engine.statc[3] >= 180)
- engine.statc[2] = 24;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 17;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 180)
+ menuCursor = 24;
+ else if(menuTime >= 120)
+ menuCursor = 17;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -591,7 +591,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -604,7 +604,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 17) {
+ } else if(menuCursor < 17) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"COUNTER", OJAMA_COUNTER_STRING[ojamaCounterMode[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
@@ -616,7 +616,7 @@
"X SHOW", GeneralUtil.getONorOFF(dangerColumnShowX[playerID]));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 2/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 24) {
+ } else if(menuCursor < 24) {
initMenu(EventReceiver.COLOR_CYAN, 17);
drawMenu(engine, playerID, receiver,
"COUNTDOWN", (ojamaCountdown[playerID] == 10) ? "NONE" :
@@ -634,7 +634,7 @@
drawMenu(engine, playerID, receiver, "CHAINPOWER",
newChainPower[playerID] ? "FEVER" : "CLASSIC");
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 3/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 32) {
+ } else if(menuCursor < 32) {
initMenu(EventReceiver.COLOR_PINK, 24);
drawMenu(engine, playerID, receiver,
"USE MAP", GeneralUtil.getONorOFF(useMap[playerID]),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java Mon Nov
26 08:57:10 2012
@@ -312,7 +312,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
goaltype += change;
if(goaltype < 0) goaltype = GOAL_TABLE.length - 1;
@@ -400,15 +400,15 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 14) {
+ if(menuCursor == 14) {
loadPreset(engine, owner.modeConfig, presetNumber);
// NET: Signal options change
if(netIsNetPlay && (netNumSpectators > 0)) netSendOptions(engine);
- } else if(engine.statc[2] == 15) {
+ } else if(menuCursor == 15) {
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -433,14 +433,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
@@ -456,7 +456,7 @@
if(netIsNetRankingDisplayMode) {
// NET: Netplay Ranking
netOnRenderNetPlayRanking(engine, playerID, receiver);
- } else if(engine.statc[2] < 6) {
+ } else if(menuCursor < 6) {
String strSpawn = spawnAboveField ? "ABOVE" : "BELOW";
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java Mon
Nov 26 08:57:10 2012
@@ -233,7 +233,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
goaltype += change;
if(goaltype < 0) goaltype = GOALTYPE_MAX - 1;
@@ -284,7 +284,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
// Save settings
@@ -307,14 +307,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java Sat Nov 10
01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java Mon Nov 26
08:57:10 2012
@@ -190,7 +190,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -251,10 +251,10 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 9) {
+ if(menuCursor == 9) {
// Load preset
loadPreset(engine, owner.modeConfig, presetNumber);
@@ -262,7 +262,7 @@
if(netIsNetPlay && (netNumSpectators > 0)) {
netSendOptions(engine);
}
- } else if(engine.statc[2] == 10) {
+ } else if(menuCursor == 10) {
// Save preset
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
@@ -290,14 +290,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java Sat Nov 10
01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java Mon Nov 26
08:57:10 2012
@@ -240,7 +240,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 19;
@@ -285,7 +285,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -307,14 +307,14 @@
netEnterNetPlayRankingScreen(engine, playerID, netGetGoalType());
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java Sat Nov 10
01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java Mon Nov 26
08:57:10 2012
@@ -355,7 +355,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 9;
@@ -375,13 +375,13 @@
}
// Check for F button, when pressed this will flip Leaderboard/Best
Section Time Records
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -395,12 +395,12 @@
sectionscomp = 0;
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java Mon
Nov 26 08:57:10 2012
@@ -387,7 +387,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 9;
@@ -413,13 +413,13 @@
}
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -433,12 +433,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GemManiaMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GemManiaMode.java Mon Nov
26 08:57:10 2012
@@ -557,7 +557,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
break;
case 1:
@@ -576,14 +576,14 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
editModeScreen = 2;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
break;
case 1:
if((propStageSet != null) && (engine.field != null)) {
@@ -608,24 +608,24 @@
// Cancel
if(engine.ctrl.isPress(Controller.BUTTON_D) &&
engine.ctrl.isPress(Controller.BUTTON_E)) {
editModeScreen = 0;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
}
- engine.statc[3]++;
+ menuTime++;
}
// エディットMenu stage 画面
else if(editModeScreen == 2) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = 4;
+ menuCursor--;
+ if(menuCursor < 0) menuCursor = 4;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 4) engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > 4) menuCursor = 0;
engine.playSE("cursor");
}
@@ -641,7 +641,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
break;
case 1:
@@ -668,40 +668,40 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 0) {
+ if(menuCursor == 0) {
engine.enterFieldEdit();
return true;
} else {
editModeScreen = 1;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
}
}
// Cancel
- if(engine.ctrl.isPush(Controller.BUTTON_B) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_B) && (menuTime >= 5)) {
editModeScreen = 1;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
}
- engine.statc[3]++;
+ menuTime++;
}
// 普通のMenu
else if(engine.owner.replayMode == false) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = 8;
+ menuCursor--;
+ if(menuCursor < 0) menuCursor = 8;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 8) engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > 8) menuCursor = 0;
engine.playSE("cursor");
}
@@ -713,7 +713,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startstage += change;
if(startstage < 0) startstage = MAX_STAGE_TOTAL - 1;
@@ -763,7 +763,7 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -784,16 +784,16 @@
engine.field.setAllSkin(engine.getSkin());
editModeScreen = 1;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java Mon
Nov 26 08:57:10 2012
@@ -538,13 +538,13 @@
owner.backgroundStatus.bg = Math.min(9, startlevel.value);
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -558,12 +558,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java Mon
Nov 26 08:57:10 2012
@@ -722,7 +722,7 @@
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 11;
@@ -787,13 +787,13 @@
}
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -834,12 +834,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
@@ -1643,7 +1643,7 @@
int gcolor = EventReceiver.COLOR_WHITE;
if((rollclear == 1) || (rollclear == 3)) gcolor =
EventReceiver.COLOR_GREEN;
if((rollclear == 2) || (rollclear == 4)) gcolor =
EventReceiver.COLOR_ORANGE;
- if((grade >= 32) && (engine.statc[2] % 2 == 0)) gcolor =
EventReceiver.COLOR_YELLOW;
+ if((grade >= 32) && (menuCursor % 2 == 0)) gcolor =
EventReceiver.COLOR_YELLOW;
receiver.drawMenuFont(engine, playerID, 0, 2, "GRADE",
EventReceiver.COLOR_BLUE);
String strGrade = String.format("%10s", getGradeName(rgrade));
receiver.drawMenuFont(engine, playerID, 0, 3, strGrade, gcolor);
@@ -1750,7 +1750,7 @@
isShowBestSectionTime = !isShowBestSectionTime;
}
- engine.statc[2]++;
+ menuCursor++;
return false;
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java Mon Nov
26 08:57:10 2012
@@ -345,13 +345,13 @@
owner.backgroundStatus.bg = Math.min(9, startlevel.value);
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -365,12 +365,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/LegacyNetVSBattleMode.java
Sat Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/LegacyNetVSBattleMode.java
Mon Nov 26 08:57:10 2012
@@ -983,13 +983,13 @@
if((netLobby != null) && (netLobby.netPlayerClient != null)) {
if((!isReadyChangePending) && (numPlayers >= 2)) {
// Ready ON
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)
&& (isReady[0] == false) && (!currentRoomInfo.playing)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5) &&
(isReady[0] == false) && (!currentRoomInfo.playing)) {
engine.playSE("decide");
isReadyChangePending = true;
netLobby.netPlayerClient.send("ready\ttrue\n");
}
// Ready OFF
- if(engine.ctrl.isPush(Controller.BUTTON_B) && (engine.statc[3] >= 5)
&& (isReady[0] == true) && (!currentRoomInfo.playing)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_B) && (menuTime >= 5) &&
(isReady[0] == true) && (!currentRoomInfo.playing)) {
engine.playSE("change");
isReadyChangePending = true;
netLobby.netPlayerClient.send("ready\tfalse\n");
@@ -998,7 +998,7 @@
// Random map preview
if((currentRoomInfo != null) && currentRoomInfo.useMap
&& !netLobby.mapList.isEmpty()) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= netLobby.mapList.size()) engine.statc[5] = 0;
engine.createFieldIfNeeded();
@@ -1011,18 +1011,18 @@
}
// Practice mode
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("decide");
startPractice(engine);
}
}
// GC呼び出し
- if(engine.statc[3] == 0) {
+ if(menuTime == 0) {
System.gc();
}
- engine.statc[3]++;
+ menuTime++;
}
return true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/LineRaceMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/LineRaceMode.java Mon Nov
26 08:57:10 2012
@@ -183,7 +183,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -247,10 +247,10 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5) &&
(!netIsWatch)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5) &&
(!netIsWatch)) {
engine.playSE("decide");
- if(engine.statc[2] == 10) {
+ if(menuCursor == 10) {
// Load preset
loadPreset(engine, owner.modeConfig, presetNumber);
@@ -258,7 +258,7 @@
if(netIsNetPlay && (netNumSpectators > 0)) {
netSendOptions(engine);
}
- } else if(engine.statc[2] == 11) {
+ } else if(menuCursor == 11) {
// Save preset
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
@@ -285,14 +285,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java Mon Nov
26 08:57:10 2012
@@ -223,7 +223,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(tableGameClearLines[goaltype] >= 0) {
@@ -280,7 +280,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -302,14 +302,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java Mon
Nov 26 08:57:10 2012
@@ -254,7 +254,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 20;
@@ -297,7 +297,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -319,14 +319,14 @@
netEnterNetPlayRankingScreen(engine, playerID, netGetGoalType());
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyMode.java Mon Nov
26 08:57:10 2012
@@ -311,7 +311,7 @@
*/
@Override
public boolean onEndingStart(GameEngine engine, int playerID) {
- if(engine.statc[2] == 0) {
+ if(menuCursor == 0) {
// NET: Send game completed messages
if(netIsNetPlay && !netIsWatch && ((netNumSpectators > 0) ||
(netForceSendMovements))) {
netSendField(engine);
@@ -431,7 +431,7 @@
if((engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP) ||
engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) &&
netIsNetPlay && ((netNumSpectators > 0) || (netForceSendMovements)))
{
- netLobby.netPlayerClient.send("game\tcursor\t" + engine.statc[2]
+ "\n");
+ netLobby.netPlayerClient.send("game\tcursor\t" + menuCursor + "\n");
}
return change;
@@ -551,7 +551,7 @@
// Move cursor
if(message[3].equals("cursor")) {
if(engine.stat == GameEngine.STAT_SETTING) {
- engine.statc[2] = Integer.parseInt(message[4]);
+ menuCursor = Integer.parseInt(message[4]);
engine.playSE("cursor");
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyVSMode.java Wed
Mar 2 00:15:52 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyVSMode.java Mon Nov
26 08:57:10 2012
@@ -678,7 +678,7 @@
engine.enableSE = true;
engine.isVisible = true;
- if((!netvsIsReadyChangePending) && (netvsNumPlayers >= 2) &&
(!netvsIsNewcomer) && (engine.statc[3] >= 5)) {
+ if((!netvsIsReadyChangePending) && (netvsNumPlayers >= 2) &&
(!netvsIsNewcomer) && (menuTime >= 5)) {
// Ready ON
if(engine.ctrl.isPush(Controller.BUTTON_A) && !netvsPlayerReady[0]) {
engine.playSE("decide");
@@ -694,7 +694,7 @@
}
// Practice Mode
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("decide");
netvsStartPractice(engine);
return true;
@@ -704,7 +704,7 @@
// Random Map Preview
if((netCurrentRoomInfo != null) && netCurrentRoomInfo.useMap
&& !netLobby.mapList.isEmpty()) {
if(netvsPlayerExist[playerID]) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= netLobby.mapList.size()) engine.statc[5] = 0;
engine.createFieldIfNeeded();
@@ -719,7 +719,7 @@
}
}
- engine.statc[3]++;
+ menuTime++;
return true;
}
@@ -757,7 +757,7 @@
}
}
- if((playerID == 0) && !netvsIsWatch() && (engine.statc[3] >= 5)) {
+ if((playerID == 0) && !netvsIsWatch() && (menuTime >= 5)) {
String strTemp = "F(" + owner.receiver.getKeyNameByButtonID(engine,
Controller.BUTTON_F) + " KEY):";
if(strTemp.length() > 10) strTemp = strTemp.substring(0, 10);
strTemp = strTemp.toUpperCase();
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java Mon
Nov 26 08:57:10 2012
@@ -31,6 +31,9 @@
import mu.nu.nullpo.game.component.Controller;
import mu.nu.nullpo.game.event.EventReceiver;
import mu.nu.nullpo.game.play.GameEngine;
+import mu.nu.nullpo.game.subsystem.mode.menu.BooleanMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.IntegerMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.OnOffMenuItem;
import mu.nu.nullpo.util.CustomProperties;
import mu.nu.nullpo.util.GeneralUtil;
@@ -186,16 +189,16 @@
private boolean isShowBestSectionTime;
/** Selected start level */
- private int startlevel;
+ private IntegerMenuItem startlevel;
/** Enable/Disable level stop sfx */
- private boolean lvstopse;
+ private BooleanMenuItem lvstopse;
/** Big mode */
- private boolean big;
+ private BooleanMenuItem big;
/** Show section time */
- private boolean showsectiontime;
+ private BooleanMenuItem showsectiontime;
/** Version of this mode */
private int version;
@@ -218,6 +221,23 @@
/** Best section time records */
private int[] bestSectionTime;
+ public PhantomManiaMode()
+ {
+ propName = "phantommania";
+
+ startlevel = new IntegerMenuItem("startlevel", "LEVEL",
EventReceiver.COLOR_BLUE, 0, 0, 9) {
+ public String getValueString() {
+ return String.valueOf(value * 100);
+ }
+ };
+ lvstopse = new OnOffMenuItem("lvstopse", "LVSTOPSE",
EventReceiver.COLOR_BLUE, false);
+ big = new OnOffMenuItem("big", "BIG", EventReceiver.COLOR_BLUE, false);
+ showsectiontime = new OnOffMenuItem("big", "BIG",
EventReceiver.COLOR_BLUE, true);
+ menu.add(startlevel);
+ menu.add(lvstopse);
+ menu.add(showsectiontime);
+ menu.add(big);
+ }
/**
* Returns the name of this mode
*/
@@ -260,10 +280,6 @@
recoveryFlag = false;
rotateCount = 0;
isShowBestSectionTime = false;
- startlevel = 0;
- lvstopse = false;
- big = false;
- showsectiontime = true;
rankingRank = -1;
rankingGrade = new int[RANKING_MAX];
@@ -294,27 +310,7 @@
version = owner.replayProp.getProperty("phantommania.version", 0);
}
- owner.backgroundStatus.bg = startlevel;
- }
-
- /**
- * Load the settings
- */
- protected void loadSetting(CustomProperties prop) {
- startlevel = prop.getProperty("phantommania.startlevel", 0);
- lvstopse = prop.getProperty("phantommania.lvstopse", false);
- showsectiontime = prop.getProperty("phantommania.showsectiontime", true);
- big = prop.getProperty("phantommania.big", false);
- }
-
- /**
- * Save the settings
- */
- protected void saveSetting(CustomProperties prop) {
- prop.setProperty("phantommania.startlevel", startlevel);
- prop.setProperty("phantommania.lvstopse", lvstopse);
- prop.setProperty("phantommania.showsectiontime", showsectiontime);
- prop.setProperty("phantommania.big", big);
+ owner.backgroundStatus.bg = startlevel.value;
}
/**
@@ -347,7 +343,7 @@
private void setAverageSectionTime() {
if(sectionscomp > 0) {
int temp = 0;
- for(int i = startlevel; i < startlevel + sectionscomp; i++) temp +=
sectiontime[i];
+ for(int i = startlevel.value; i < startlevel.value + sectionscomp; i++)
temp += sectiontime[i];
sectionavgtime = temp / sectionscomp;
} else {
sectionavgtime = 0;
@@ -407,39 +403,17 @@
@Override
public boolean onSetting(GameEngine engine, int playerID) {
if(engine.owner.replayMode == false) {
- // Configuration changes
- int change = updateCursor(engine, 3);
-
- if(change != 0) {
- receiver.playSE("change");
-
- switch(engine.statc[2]) {
- case 0:
- startlevel += change;
- if(startlevel < 0) startlevel = 9;
- if(startlevel > 9) startlevel = 0;
- owner.backgroundStatus.bg = startlevel;
- break;
- case 1:
- lvstopse = !lvstopse;
- break;
- case 2:
- showsectiontime = !showsectiontime;
- break;
- case 3:
- big = !big;
- break;
- }
- }
+ updateMenu(engine);
+ owner.backgroundStatus.bg = startlevel.value;
// Check for F button, when pressed this will flip Leaderboard/Best
Section Time Records
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -452,37 +426,25 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
return true;
}
-
- /**
- * Renders game setup screen
- */
- @Override
- public void renderSetting(GameEngine engine, int playerID) {
- drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
- "LEVEL", String.valueOf(startlevel * 100),
- "LVSTOPSE", GeneralUtil.getONorOFF(lvstopse),
- "SHOW STIME", GeneralUtil.getONorOFF(showsectiontime),
- "BIG", GeneralUtil.getONorOFF(big));
- }
/**
* This function will be called before the game actually begins (after
Ready&Go screen disappears)
*/
@Override
public void startGame(GameEngine engine, int playerID) {
- engine.statistics.level = startlevel * 100;
+ engine.statistics.level = startlevel.value * 100;
nextseclv = engine.statistics.level + 100;
if(engine.statistics.level < 0) nextseclv = 100;
@@ -490,7 +452,7 @@
owner.backgroundStatus.bg = engine.statistics.level / 100;
- engine.big = big;
+ engine.big = big.value;
setSpeed(engine);
setStartBgmlv(engine);
@@ -507,7 +469,7 @@
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((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (engine.ai == null)) {
+ if((owner.replayMode == false) && (startlevel.value == 0) &&
(!big.value) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Leaderboard
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
@@ -595,7 +557,7 @@
if(medalRO >= 1) receiver.drawScoreFont(engine, playerID, 0, 22, "RO",
getMedalFontColor(medalRO));
if(medalCO >= 1) receiver.drawScoreFont(engine, playerID, 3, 22, "CO",
getMedalFontColor(medalCO));
- if((showsectiontime == true) && (sectiontime != null)) {
+ if(showsectiontime.value && (sectiontime != null)) {
int x = (receiver.getNextDisplayType() == 2) ? 8 : 12;
int x2 = (receiver.getNextDisplayType() == 2) ? 9 : 12;
@@ -633,7 +595,7 @@
if((engine.ending == 0) && (engine.statc[0] == 0) && (engine.holdDisable
== false) && (!lvupflag)) {
if(engine.statistics.level < nextseclv - 1) {
engine.statistics.level++;
- if((engine.statistics.level == nextseclv - 1) && (lvstopse == true))
owner.receiver.playSE("levelstop");
+ if((engine.statistics.level == nextseclv - 1) && lvstopse.value)
owner.receiver.playSE("levelstop");
}
levelUp(engine);
@@ -672,7 +634,7 @@
if((engine.ending == 0) && (engine.statc[0] >= engine.statc[1] - 1) &&
(!lvupflag)) {
if(engine.statistics.level < nextseclv - 1) {
engine.statistics.level++;
- if((engine.statistics.level == nextseclv - 1) && (lvstopse == true))
owner.receiver.playSE("levelstop");
+ if((engine.statistics.level == nextseclv - 1) && lvstopse.value)
owner.receiver.playSE("levelstop");
}
levelUp(engine);
lvupflag = true;
@@ -718,7 +680,7 @@
if(lines >= 4) {
sectionfourline++;
- if(big == true) {
+ if(big.value) {
if((engine.statistics.totalFour == 1) || (engine.statistics.totalFour
== 2) || (engine.statistics.totalFour == 4)) {
receiver.playSE("medal");
medalSK++;
@@ -740,7 +702,7 @@
}
}
- if(big == true) {
+ if(big.value) {
if((engine.combo >= 2) && (medalCO < 1)) {
receiver.playSE("medal");
medalCO = 1;
@@ -879,7 +841,7 @@
if((nextseclv == 300) || (nextseclv == 700)) roMedalCheck(engine);
- if (startlevel == 0)
+ if (startlevel.value == 0)
{
for (int i = 0; i < tableGradeLevel.length - 1; i++)
{
@@ -892,7 +854,7 @@
nextseclv += 100;
if(nextseclv > 999) nextseclv = 999;
- } else if((engine.statistics.level == nextseclv - 1) && (lvstopse ==
true)) {
+ } else if((engine.statistics.level == nextseclv - 1) && lvstopse.value)
{
receiver.playSE("levelstop");
}
@@ -1046,7 +1008,7 @@
saveSetting(owner.replayProp);
owner.replayProp.setProperty("phantommania.version", version);
- if((owner.replayMode == false) && (startlevel == 0) && (big == false) &&
(engine.ai == null)) {
+ if((owner.replayMode == false) && (startlevel.value == 0) &&
(!big.value) && (engine.ai == null)) {
updateRanking(grade, engine.statistics.level, engine.statistics.time,
rollclear);
if(medalST == 3) updateBestSectionTime();
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Mon Nov
26 08:57:10 2012
@@ -186,7 +186,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
if (m >= 10) hoverBlocks += change*10;
@@ -202,7 +202,7 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -214,12 +214,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java Mon
Nov 26 08:57:10 2012
@@ -401,7 +401,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -496,12 +496,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -518,28 +518,28 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 120)
+ if(menuTime >= 120)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -563,7 +563,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
initMenu(EventReceiver.COLOR_ORANGE, 0);
drawMenu(engine, playerID, receiver,
"GRAVITY", String.valueOf(engine.speed.gravity),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PracticeMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PracticeMode.java Mon Nov
26 08:57:10 2012
@@ -407,7 +407,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -585,14 +585,14 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 41) {
+ if(menuCursor == 41) {
// fieldエディット
engine.enterFieldEdit();
return true;
- } else if(engine.statc[2] == 42) {
+ } else if(menuCursor == 42) {
// Map読み込み
engine.createFieldIfNeeded();
engine.field.reset();
@@ -602,17 +602,17 @@
loadMap(engine.field, prop, 0);
engine.field.setAllSkin(engine.getSkin());
}
- } else if(engine.statc[2] == 43) {
+ } else if(menuCursor == 43) {
// Map保存
if(engine.field != null) {
CustomProperties prop = new CustomProperties();
saveMap(engine.field, prop, 0);
receiver.saveProperties("config/map/practice/" + mapNumber + ".map",
prop);
}
- } else if(engine.statc[2] == 44) {
+ } else if(menuCursor == 44) {
// Preset読み込み
loadPreset(engine, owner.modeConfig, presetNumber);
- } else if(engine.statc[2] == 45) {
+ } else if(menuCursor == 45) {
// Preset保存
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
@@ -644,17 +644,17 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
owner.menuOnly = true;
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 22;
+ if(menuTime >= 60) {
+ menuCursor = 22;
}
- if((engine.statc[3] >= 120) || engine.ctrl.isPush(Controller.BUTTON_F))
{
+ if((menuTime >= 120) || engine.ctrl.isPush(Controller.BUTTON_F)) {
owner.menuOnly = false;
return false;
}
@@ -676,21 +676,21 @@
receiver.drawMenuFont(engine, playerID, 1, 27, "F:SKIP",
EventReceiver.COLOR_RED);
}
- if(engine.statc[2] < 23) {
+ if(menuCursor < 23) {
if(owner.replayMode == false) {
- receiver.drawMenuFont(engine, playerID, 1, engine.statc[2] + 3, "b",
EventReceiver.COLOR_RED);
+ receiver.drawMenuFont(engine, playerID, 1, menuCursor + 3, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 2, 3, "GRAVITY:" +
engine.speed.gravity, (engine.statc[2] == 0));
- receiver.drawMenuFont(engine, playerID, 2, 4, "G-MAX:" +
engine.speed.denominator, (engine.statc[2] == 1));
- receiver.drawMenuFont(engine, playerID, 2, 5, "ARE:" +
engine.speed.are, (engine.statc[2] == 2));
- receiver.drawMenuFont(engine, playerID, 2, 6, "ARE LINE:" +
engine.speed.areLine, (engine.statc[2] == 3));
- receiver.drawMenuFont(engine, playerID, 2, 7, "LINE DELAY:" +
engine.speed.lineDelay, (engine.statc[2] == 4));
- receiver.drawMenuFont(engine, playerID, 2, 8, "LOCK DELAY:" +
engine.speed.lockDelay, (engine.statc[2] == 5));
- receiver.drawMenuFont(engine, playerID, 2, 9, "DAS:" +
engine.speed.das, (engine.statc[2] == 6));
- receiver.drawMenuFont(engine, playerID, 2, 10, "BGM:" + bgmno,
(engine.statc[2] == 7));
- receiver.drawMenuFont(engine, playerID, 2, 11, "BIG:" +
GeneralUtil.getONorOFF(big), (engine.statc[2] == 8));
- receiver.drawMenuFont(engine, playerID, 2, 12, "LEVEL TYPE:" +
LEVELTYPE_STRING[leveltype], (engine.statc[2] == 9));
+ receiver.drawMenuFont(engine, playerID, 2, 3, "GRAVITY:" +
engine.speed.gravity, (menuCursor == 0));
+ receiver.drawMenuFont(engine, playerID, 2, 4, "G-MAX:" +
engine.speed.denominator, (menuCursor == 1));
+ receiver.drawMenuFont(engine, playerID, 2, 5, "ARE:" +
engine.speed.are, (menuCursor == 2));
+ receiver.drawMenuFont(engine, playerID, 2, 6, "ARE LINE:" +
engine.speed.areLine, (menuCursor == 3));
+ receiver.drawMenuFont(engine, playerID, 2, 7, "LINE DELAY:" +
engine.speed.lineDelay, (menuCursor == 4));
+ receiver.drawMenuFont(engine, playerID, 2, 8, "LOCK DELAY:" +
engine.speed.lockDelay, (menuCursor == 5));
+ receiver.drawMenuFont(engine, playerID, 2, 9, "DAS:" +
engine.speed.das, (menuCursor == 6));
+ receiver.drawMenuFont(engine, playerID, 2, 10, "BGM:" + bgmno,
(menuCursor == 7));
+ receiver.drawMenuFont(engine, playerID, 2, 11, "BIG:" +
GeneralUtil.getONorOFF(big), (menuCursor == 8));
+ receiver.drawMenuFont(engine, playerID, 2, 12, "LEVEL TYPE:" +
LEVELTYPE_STRING[leveltype], (menuCursor == 9));
String strTSpinEnable = "";
if(version >= 4) {
if(tspinEnableType == 0) strTSpinEnable = "OFF";
@@ -699,15 +699,15 @@
} else {
strTSpinEnable = GeneralUtil.getONorOFF(enableTSpin);
}
- receiver.drawMenuFont(engine, playerID, 2, 13, "SPIN BONUS:" +
strTSpinEnable, (engine.statc[2] == 10));
- receiver.drawMenuFont(engine, playerID, 2, 14, "EZ SPIN:" +
GeneralUtil.getONorOFF(enableTSpinKick), (engine.statc[2] == 11));
- receiver.drawMenuFont(engine, playerID, 2, 15, "SPIN TYPE:" +
((spinCheckType == 0) ? "4POINT" : "IMMOBILE"), (engine.statc[2] == 12));
- receiver.drawMenuFont(engine, playerID, 2, 16, "EZ IMMOBILE:" +
GeneralUtil.getONorOFF(tspinEnableEZ), (engine.statc[2] == 13));
- receiver.drawMenuFont(engine, playerID, 2, 17, "B2B:" +
GeneralUtil.getONorOFF(enableB2B), (engine.statc[2] == 14));
- receiver.drawMenuFont(engine, playerID, 2, 18, "COMBO:" +
COMBOTYPE_STRING[comboType], (engine.statc[2] == 15));
- receiver.drawMenuFont(engine, playerID, 2, 19, "LEVEL STOP SE:" +
GeneralUtil.getONorOFF(lvstopse), (engine.statc[2] == 16));
- receiver.drawMenuFont(engine, playerID, 2, 20, "BIG MOVE:" +
(bigmove ? "2 CELL" : "1 CELL"), (engine.statc[2] == 17));
- receiver.drawMenuFont(engine, playerID, 2, 21, "BIG HALF:" +
GeneralUtil.getONorOFF(bighalf), (engine.statc[2] == 18));
+ receiver.drawMenuFont(engine, playerID, 2, 13, "SPIN BONUS:" +
strTSpinEnable, (menuCursor == 10));
+ receiver.drawMenuFont(engine, playerID, 2, 14, "EZ SPIN:" +
GeneralUtil.getONorOFF(enableTSpinKick), (menuCursor == 11));
+ receiver.drawMenuFont(engine, playerID, 2, 15, "SPIN TYPE:" +
((spinCheckType == 0) ? "4POINT" : "IMMOBILE"), (menuCursor == 12));
+ receiver.drawMenuFont(engine, playerID, 2, 16, "EZ IMMOBILE:" +
GeneralUtil.getONorOFF(tspinEnableEZ), (menuCursor == 13));
+ receiver.drawMenuFont(engine, playerID, 2, 17, "B2B:" +
GeneralUtil.getONorOFF(enableB2B), (menuCursor == 14));
+ receiver.drawMenuFont(engine, playerID, 2, 18, "COMBO:" +
COMBOTYPE_STRING[comboType], (menuCursor == 15));
+ receiver.drawMenuFont(engine, playerID, 2, 19, "LEVEL STOP SE:" +
GeneralUtil.getONorOFF(lvstopse), (menuCursor == 16));
+ receiver.drawMenuFont(engine, playerID, 2, 20, "BIG MOVE:" +
(bigmove ? "2 CELL" : "1 CELL"), (menuCursor == 17));
+ receiver.drawMenuFont(engine, playerID, 2, 21, "BIG HALF:" +
GeneralUtil.getONorOFF(bighalf), (menuCursor == 18));
String strGoalLv = "ENDLESS";
if(goallv >= 0) {
if((leveltype == LEVELTYPE_MANIA) || (leveltype ==
LEVELTYPE_MANIAPLUS))
@@ -717,48 +717,48 @@
else
strGoalLv = "LV" + String.valueOf(goallv + 1);
}
- receiver.drawMenuFont(engine, playerID, 2, 22, "GOAL LEVEL:" +
strGoalLv, (engine.statc[2] == 19));
+ receiver.drawMenuFont(engine, playerID, 2, 22, "GOAL LEVEL:" +
strGoalLv, (menuCursor == 19));
receiver.drawMenuFont(engine, playerID, 2, 23, "TIME LIMIT:" +
((timelimit == 0) ? "NONE" : GeneralUtil.getTime(timelimit)),
- (engine.statc[2] == 20));
+ (menuCursor == 20));
receiver.drawMenuFont(engine, playerID, 2, 24, "ROLL LIMIT:" +
((rolltimelimit == 0) ? "NONE" : GeneralUtil.getTime(rolltimelimit)),
- (engine.statc[2] == 21));
+ (menuCursor == 21));
receiver.drawMenuFont(engine, playerID, 2, 25, "TIME LIMIT RESET EVERY
LEVEL:" + GeneralUtil.getONorOFF(timelimitResetEveryLevel),
- (engine.statc[2] == 22));
- } else if(engine.statc[2] < 46) {
+ (menuCursor == 22));
+ } else if(menuCursor < 46) {
if(owner.replayMode == false) {
- receiver.drawMenuFont(engine, playerID, 1, engine.statc[2] - 23 +
3, "b", EventReceiver.COLOR_RED);
+ receiver.drawMenuFont(engine, playerID, 1, menuCursor - 23 + 3, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 2, 3, "USE BONE BLOCKS:" +
GeneralUtil.getONorOFF(bone), (engine.statc[2] == 23));
+ receiver.drawMenuFont(engine, playerID, 2, 3, "USE BONE BLOCKS:" +
GeneralUtil.getONorOFF(bone), (menuCursor == 23));
String strHiddenFrames = "NONE";
if(blockHidden == -2) strHiddenFrames = "LOCK FLASH (" +
engine.ruleopt.lockflash + "F)";
if(blockHidden >= 0) strHiddenFrames = String.format("%d (%.2f SEC.)",
blockHidden, (float)(blockHidden / 60f));
- receiver.drawMenuFont(engine, playerID, 2, 4, "BLOCK HIDDEN FRAMES:" +
strHiddenFrames, (engine.statc[2] == 24));
+ receiver.drawMenuFont(engine, playerID, 2, 4, "BLOCK HIDDEN FRAMES:" +
strHiddenFrames, (menuCursor == 24));
receiver.drawMenuFont(engine, playerID, 2, 5, "BLOCK HIDDEN ANIM:" +
GeneralUtil.getONorOFF(blockHiddenAnim),
- (engine.statc[2] == 25));
+ (menuCursor == 25));
receiver.drawMenuFont(engine, playerID, 2, 6, "BLOCK OUTLINE TYPE:" +
BLOCK_OUTLINE_TYPE_STRING[blockOutlineType],
- (engine.statc[2] == 26));
+ (menuCursor == 26));
receiver.drawMenuFont(engine, playerID, 2, 7, "BLOCK OUTLINE ONLY:" +
GeneralUtil.getONorOFF(blockShowOutlineOnly),
- (engine.statc[2] == 27));
+ (menuCursor == 27));
receiver.drawMenuFont(engine, playerID, 2, 8, "HEBO HIDDEN:" +
((heboHiddenLevel == 0) ? "NONE" : "LV"+heboHiddenLevel),
- (engine.statc[2] == 28));
- receiver.drawMenuFont(engine, playerID, 2, 9, "PIECE I:" +
GeneralUtil.getONorOFF(pieceEnable[0]), (engine.statc[2] == 29));
- receiver.drawMenuFont(engine, playerID, 2, 10, "PIECE L:" +
GeneralUtil.getONorOFF(pieceEnable[1]), (engine.statc[2] == 30));
- receiver.drawMenuFont(engine, playerID, 2, 11, "PIECE O:" +
GeneralUtil.getONorOFF(pieceEnable[2]), (engine.statc[2] == 31));
- receiver.drawMenuFont(engine, playerID, 2, 12, "PIECE Z:" +
GeneralUtil.getONorOFF(pieceEnable[3]), (engine.statc[2] == 32));
- receiver.drawMenuFont(engine, playerID, 2, 13, "PIECE T:" +
GeneralUtil.getONorOFF(pieceEnable[4]), (engine.statc[2] == 33));
- receiver.drawMenuFont(engine, playerID, 2, 14, "PIECE J:" +
GeneralUtil.getONorOFF(pieceEnable[5]), (engine.statc[2] == 34));
- receiver.drawMenuFont(engine, playerID, 2, 15, "PIECE S:" +
GeneralUtil.getONorOFF(pieceEnable[6]), (engine.statc[2] == 35));
- receiver.drawMenuFont(engine, playerID, 2, 16, "PIECE I1:" +
GeneralUtil.getONorOFF(pieceEnable[7]), (engine.statc[2] == 36));
- receiver.drawMenuFont(engine, playerID, 2, 17, "PIECE I2:" +
GeneralUtil.getONorOFF(pieceEnable[8]), (engine.statc[2] == 37));
- receiver.drawMenuFont(engine, playerID, 2, 18, "PIECE I3:" +
GeneralUtil.getONorOFF(pieceEnable[9]), (engine.statc[2] == 38));
- receiver.drawMenuFont(engine, playerID, 2, 19, "PIECE L3:" +
GeneralUtil.getONorOFF(pieceEnable[10]), (engine.statc[2] == 39));
- receiver.drawMenuFont(engine, playerID, 2, 20, "USE MAP:" +
GeneralUtil.getONorOFF(useMap), (engine.statc[2] == 40));
- receiver.drawMenuFont(engine, playerID, 2, 21, "[EDIT FIELD MAP]",
(engine.statc[2] == 41));
- receiver.drawMenuFont(engine, playerID, 2, 22, "[LOAD FIELD MAP]:" +
mapNumber, (engine.statc[2] == 42));
- receiver.drawMenuFont(engine, playerID, 2, 23, "[SAVE FIELD MAP]:" +
mapNumber, (engine.statc[2] == 43));
- receiver.drawMenuFont(engine, playerID, 2, 24, "[LOAD PRESET]:" +
presetNumber, (engine.statc[2] == 44));
- receiver.drawMenuFont(engine, playerID, 2, 25, "[SAVE PRESET]:" +
presetNumber, (engine.statc[2] == 45));
+ (menuCursor == 28));
+ receiver.drawMenuFont(engine, playerID, 2, 9, "PIECE I:" +
GeneralUtil.getONorOFF(pieceEnable[0]), (menuCursor == 29));
+ receiver.drawMenuFont(engine, playerID, 2, 10, "PIECE L:" +
GeneralUtil.getONorOFF(pieceEnable[1]), (menuCursor == 30));
+ receiver.drawMenuFont(engine, playerID, 2, 11, "PIECE O:" +
GeneralUtil.getONorOFF(pieceEnable[2]), (menuCursor == 31));
+ receiver.drawMenuFont(engine, playerID, 2, 12, "PIECE Z:" +
GeneralUtil.getONorOFF(pieceEnable[3]), (menuCursor == 32));
+ receiver.drawMenuFont(engine, playerID, 2, 13, "PIECE T:" +
GeneralUtil.getONorOFF(pieceEnable[4]), (menuCursor == 33));
+ receiver.drawMenuFont(engine, playerID, 2, 14, "PIECE J:" +
GeneralUtil.getONorOFF(pieceEnable[5]), (menuCursor == 34));
+ receiver.drawMenuFont(engine, playerID, 2, 15, "PIECE S:" +
GeneralUtil.getONorOFF(pieceEnable[6]), (menuCursor == 35));
+ receiver.drawMenuFont(engine, playerID, 2, 16, "PIECE I1:" +
GeneralUtil.getONorOFF(pieceEnable[7]), (menuCursor == 36));
+ receiver.drawMenuFont(engine, playerID, 2, 17, "PIECE I2:" +
GeneralUtil.getONorOFF(pieceEnable[8]), (menuCursor == 37));
+ receiver.drawMenuFont(engine, playerID, 2, 18, "PIECE I3:" +
GeneralUtil.getONorOFF(pieceEnable[9]), (menuCursor == 38));
+ receiver.drawMenuFont(engine, playerID, 2, 19, "PIECE L3:" +
GeneralUtil.getONorOFF(pieceEnable[10]), (menuCursor == 39));
+ receiver.drawMenuFont(engine, playerID, 2, 20, "USE MAP:" +
GeneralUtil.getONorOFF(useMap), (menuCursor == 40));
+ receiver.drawMenuFont(engine, playerID, 2, 21, "[EDIT FIELD MAP]",
(menuCursor == 41));
+ receiver.drawMenuFont(engine, playerID, 2, 22, "[LOAD FIELD MAP]:" +
mapNumber, (menuCursor == 42));
+ receiver.drawMenuFont(engine, playerID, 2, 23, "[SAVE FIELD MAP]:" +
mapNumber, (menuCursor == 43));
+ receiver.drawMenuFont(engine, playerID, 2, 24, "[LOAD PRESET]:" +
presetNumber, (menuCursor == 44));
+ receiver.drawMenuFont(engine, playerID, 2, 25, "[SAVE PRESET]:" +
presetNumber, (menuCursor == 45));
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java Mon Nov
26 08:57:10 2012
@@ -204,7 +204,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
if(gametype < 0) gametype = GAMETYPE_MAX - 1;
@@ -226,7 +226,7 @@
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -238,12 +238,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java Mon
Nov 26 08:57:10 2012
@@ -256,7 +256,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
if(gametype < 0) gametype = GAMETYPE_MAX - 1;
@@ -281,7 +281,7 @@
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -293,12 +293,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMasteryMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMasteryMode.java Mon
Nov 26 08:57:10 2012
@@ -215,16 +215,16 @@
if(engine.owner.replayMode == false) {
// Check for UP button, when pressed it will move cursor up.
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] == 1 && gametype == GAMETYPE_PRESSURE)
engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = 2;
+ menuCursor--;
+ if(menuCursor == 1 && gametype == GAMETYPE_PRESSURE) menuCursor--;
+ if(menuCursor < 0) menuCursor = 2;
receiver.playSE("cursor");
}
// Check for DOWN button, when pressed it will move cursor down.
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] == 1 && gametype == GAMETYPE_PRESSURE)
engine.statc[2]++;
- if(engine.statc[2] > 2) engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor == 1 && gametype == GAMETYPE_PRESSURE) menuCursor++;
+ if(menuCursor > 2) menuCursor = 0;
receiver.playSE("cursor");
}
@@ -236,7 +236,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
if(gametype < 0) gametype = GAMETYPE_MAX - 1;
@@ -256,7 +256,7 @@
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -268,12 +268,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
@@ -287,17 +287,17 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.owner.replayMode == false) {
- receiver.drawMenuFont(engine, playerID, 0, (engine.statc[2] * 2) +
1, "b", EventReceiver.COLOR_RED);
+ receiver.drawMenuFont(engine, playerID, 0, (menuCursor * 2) + 1, "b",
EventReceiver.COLOR_RED);
}
receiver.drawMenuFont(engine, playerID, 0, 0, "GAME TYPE",
EventReceiver.COLOR_BLUE);
- receiver.drawMenuFont(engine, playerID, 1, 1, GAMETYPE_NAME[gametype],
(engine.statc[2] == 0));
+ receiver.drawMenuFont(engine, playerID, 1, 1, GAMETYPE_NAME[gametype],
(menuCursor == 0));
if(gametype != GAMETYPE_PRESSURE){
receiver.drawMenuFont(engine, playerID, 0, 2, "LEVEL",
EventReceiver.COLOR_BLUE);
- receiver.drawMenuFont(engine, playerID, 1, 3, String.format("%02d",
startlevel), (engine.statc[2] == 1));
+ receiver.drawMenuFont(engine, playerID, 1, 3, String.format("%02d",
startlevel), (menuCursor == 1));
}
receiver.drawMenuFont(engine, playerID, 0, 4, "BIG",
EventReceiver.COLOR_BLUE);
- receiver.drawMenuFont(engine, playerID, 1, 5,
GeneralUtil.getONorOFF(big), (engine.statc[2] == 2));
+ receiver.drawMenuFont(engine, playerID, 1, 5,
GeneralUtil.getONorOFF(big), (menuCursor == 2));
}
/**
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java Sat Nov 10
00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java Mon Nov 26
08:57:10 2012
@@ -564,23 +564,23 @@
if((engine.owner.replayMode == false) && (engine.statc[4] == 0)) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0){
- engine.statc[2] = 19;
+ menuCursor--;
+ if(menuCursor < 0){
+ menuCursor = 19;
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
}
- else if (engine.statc[2] == 17)
+ else if (menuCursor == 17)
engine.field = null;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 19) {
- engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > 19) {
+ menuCursor = 0;
engine.field = null;
}
- else if (engine.statc[2] == 18)
+ else if (menuCursor == 18)
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
engine.playSE("cursor");
}
@@ -597,7 +597,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -715,12 +715,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -737,35 +737,35 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 180)
+ if(menuTime >= 180)
engine.statc[4] = 1;
- else if(engine.statc[3] > 120)
- engine.statc[2] = 18;
- else if (engine.statc[3] == 120)
+ else if(menuTime > 120)
+ menuCursor = 18;
+ else if (menuTime == 120)
{
- engine.statc[2] = 18;
+ menuCursor = 18;
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
}
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -789,7 +789,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
initMenu(EventReceiver.COLOR_ORANGE, 0);
drawMenu(engine, playerID, receiver,
"GRAVITY", String.valueOf(engine.speed.gravity),
@@ -804,7 +804,7 @@
"LOAD", String.valueOf(presetNumber[playerID]),
"SAVE", String.valueOf(presetNumber[playerID]));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/3",
EventReceiver.COLOR_YELLOW);
- } else if (engine.statc[2] < 18){
+ } else if (menuCursor < 18){
initMenu(EventReceiver.COLOR_PINK, 9);
drawMenu(engine, playerID, receiver, "BGM", String.valueOf(bgmno));
menuColor = EventReceiver.COLOR_CYAN;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java Mon
Nov 26 08:57:10 2012
@@ -297,7 +297,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 2;
@@ -320,13 +320,13 @@
}
// Check for F button, when pressed this will flip Leaderboard/Best
Section Time Records
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -340,12 +340,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java Mon Nov
26 08:57:10 2012
@@ -260,7 +260,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -347,10 +347,10 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 16) {
+ if(menuCursor == 16) {
// Load preset
loadPreset(engine, owner.modeConfig, presetNumber);
@@ -358,7 +358,7 @@
if(netIsNetPlay && (netNumSpectators > 0)) {
netSendOptions(engine);
}
- } else if(engine.statc[2] == 17) {
+ } else if(menuCursor == 17) {
// Save preset
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
@@ -386,17 +386,17 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 10;
+ if(menuTime >= 60) {
+ menuCursor = 10;
}
- if(engine.statc[3] >= 120) {
+ if(menuTime >= 120) {
return false;
}
}
@@ -412,7 +412,7 @@
if(netIsNetRankingDisplayMode) {
// NET: Netplay Ranking
netOnRenderNetPlayRanking(engine, playerID, receiver);
- } else if(engine.statc[2] < 10) {
+ } else if(menuCursor < 10) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java Mon
Nov 26 08:57:10 2012
@@ -416,7 +416,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 13;
@@ -444,13 +444,13 @@
}
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig, engine.ruleopt.strRuleName);
receiver.saveModeConfig(owner.modeConfig);
@@ -465,12 +465,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java Mon Nov
26 08:57:10 2012
@@ -31,6 +31,10 @@
import mu.nu.nullpo.game.component.Controller;
import mu.nu.nullpo.game.event.EventReceiver;
import mu.nu.nullpo.game.play.GameEngine;
+import mu.nu.nullpo.game.subsystem.mode.menu.BooleanMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.IntegerMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.OnOffMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.TimeMenuItem;
import mu.nu.nullpo.util.CustomProperties;
import mu.nu.nullpo.util.GeneralUtil;
@@ -161,19 +165,19 @@
private boolean isShowBestSectionTime;
/** Level at start */
- private int startlevel;
+ private IntegerMenuItem startlevel;
/** When true, levelstop sound is enabled */
- private boolean lvstopse;
+ private BooleanMenuItem lvstopse;
/** BigMode */
- private boolean big;
+ private BooleanMenuItem big;
/** LV500の足切りTime */
- private int lv500torikan;
+ private TimeMenuItem lv500torikan;
/** When true, section time display is enabled */
- private boolean showsectiontime;
+ private BooleanMenuItem showsectiontime;
/** Version */
private int version;
@@ -193,6 +197,28 @@
/** Section Time記録 */
private int[] bestSectionTime;
+ public SpeedManiaMode() {
+ propName = "speedmania";
+
+ startlevel = new IntegerMenuItem("startlevel", "LEVEL",
EventReceiver.COLOR_BLUE, 0, 0, 9) {
+ public String getValueString() {
+ return String.valueOf(value * 100);
+ }
+ };
+ lvstopse = new OnOffMenuItem("lvstopse", "LVSTOPSE",
EventReceiver.COLOR_BLUE, false);
+ big = new OnOffMenuItem("big", "BIG", EventReceiver.COLOR_BLUE, false);
+ showsectiontime = new OnOffMenuItem("big", "BIG",
EventReceiver.COLOR_BLUE, true);
+ lv500torikan = new TimeMenuItem("lv500torikan", "LV500LIMIT",
EventReceiver.COLOR_BLUE, 12300, 0, 72000) {
+ public String getValueString() {
+ return (value == 0) ? "NONE" : GeneralUtil.getTime(value);
+ }
+ };
+ menu.add(startlevel);
+ menu.add(lvstopse);
+ menu.add(showsectiontime);
+ menu.add(big);
+ menu.add(lv500torikan);
+ }
/*
* Mode name
*/
@@ -234,10 +260,6 @@
recoveryFlag = false;
rotateCount = 0;
isShowBestSectionTime = false;
- startlevel = 0;
- lvstopse = false;
- big = false;
- lv500torikan = 12300;
rankingRank = -1;
rankingGrade = new int[RANKING_MAX];
@@ -266,31 +288,7 @@
version = owner.replayProp.getProperty("speedmania.version", 0);
}
- owner.backgroundStatus.bg = startlevel;
- }
-
- /**
- * Load settings from property file
- * @param prop Property file
- */
- protected void loadSetting(CustomProperties prop) {
- startlevel = prop.getProperty("speedmania.startlevel", 0);
- lvstopse = prop.getProperty("speedmania.lvstopse", false);
- showsectiontime = prop.getProperty("speedmania.showsectiontime", false);
- big = prop.getProperty("speedmania.big", false);
- lv500torikan = prop.getProperty("speedmania.lv500torikan", 12300);
- }
-
- /**
- * Save settings to property file
- * @param prop Property file
- */
- protected void saveSetting(CustomProperties prop) {
- prop.setProperty("speedmania.startlevel", startlevel);
- prop.setProperty("speedmania.lvstopse", lvstopse);
- prop.setProperty("speedmania.showsectiontime", showsectiontime);
- prop.setProperty("speedmania.big", big);
- prop.setProperty("speedmania.lv500torikan", lv500torikan);
+ owner.backgroundStatus.bg = startlevel.value;
}
/**
@@ -324,7 +322,7 @@
private void setAverageSectionTime() {
if(sectionscomp > 0) {
int temp = 0;
- for(int i = startlevel; i < startlevel + sectionscomp; i++) {
+ for(int i = startlevel.value; i < startlevel.value + sectionscomp; i++)
{
if((i >= 0) && (i < sectiontime.length)) temp += sectiontime[i];
}
sectionavgtime = temp / sectionscomp;
@@ -391,43 +389,16 @@
// Menu
if(engine.owner.replayMode == false) {
// Configuration changes
- int change = updateCursor(engine, 4);
-
- if(change != 0) {
- engine.playSE("change");
-
- switch(engine.statc[2]) {
- case 0:
- startlevel += change;
- if(startlevel < 0) startlevel = 9;
- if(startlevel > 9) startlevel = 0;
- owner.backgroundStatus.bg = startlevel;
- break;
- case 1:
- lvstopse = !lvstopse;
- break;
- case 2:
- showsectiontime = !showsectiontime;
- break;
- case 3:
- big = !big;
- break;
- case 4:
- lv500torikan += 60 * change;
- if(lv500torikan < 0) lv500torikan = 72000;
- if(lv500torikan > 72000) lv500torikan = 0;
- break;
- }
- }
+ updateMenu(engine);
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -441,38 +412,25 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
return true;
}
-
- /*
- * Render the settings screen
- */
- @Override
- public void renderSetting(GameEngine engine, int playerID) {
- drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
- "LEVEL", String.valueOf(startlevel * 100),
- "LVSTOPSE", GeneralUtil.getONorOFF(lvstopse),
- "SHOW STIME", GeneralUtil.getONorOFF(showsectiontime),
- "BIG", GeneralUtil.getONorOFF(big),
- "LV500LIMIT", (lv500torikan == 0) ? "NONE" :
GeneralUtil.getTime(lv500torikan));
- }
/*
* Called at game start
*/
@Override
public void startGame(GameEngine engine, int playerID) {
- engine.statistics.level = startlevel * 100;
+ engine.statistics.level = startlevel.value * 100;
nextseclv = engine.statistics.level + 100;
if(engine.statistics.level < 0) nextseclv = 100;
@@ -480,7 +438,7 @@
owner.backgroundStatus.bg = engine.statistics.level / 100;
- engine.big = big;
+ engine.big = big.value;
setSpeed(engine);
setStartBgmlv(engine);
@@ -495,7 +453,7 @@
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((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (engine.ai == null)) {
+ if((owner.replayMode == false) && (startlevel.value == 0) && (big.value
== false) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Rankings
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
@@ -586,7 +544,7 @@
if(medalCO >= 1) receiver.drawScoreFont(engine, playerID, 3, 22, "CO",
getMedalFontColor(medalCO));
// Section Time
- if((showsectiontime == true) && (sectiontime != null)) {
+ if((showsectiontime.value) && (sectiontime != null)) {
int x = (receiver.getNextDisplayType() == 2) ? 8 : 12;
int x2 = (receiver.getNextDisplayType() == 2) ? 9 : 12;
@@ -626,7 +584,7 @@
// Level up
if(engine.statistics.level < nextseclv - 1) {
engine.statistics.level++;
- if((engine.statistics.level == nextseclv - 1) && (lvstopse == true))
engine.playSE("levelstop");
+ if((engine.statistics.level == nextseclv - 1) && (lvstopse.value))
engine.playSE("levelstop");
}
levelUp(engine);
@@ -668,7 +626,7 @@
if((engine.ending == 0) && (engine.statc[0] >= engine.statc[1] - 1) &&
(!lvupflag)) {
if(engine.statistics.level < nextseclv - 1) {
engine.statistics.level++;
- if((engine.statistics.level == nextseclv - 1) && (lvstopse == true))
engine.playSE("levelstop");
+ if((engine.statistics.level == nextseclv - 1) && (lvstopse.value))
engine.playSE("levelstop");
}
levelUp(engine);
lvupflag = true;
@@ -735,7 +693,7 @@
// 4-line clearカウント
if(lines >= 4) {
// SK medal
- if(big == true) {
+ if(big.value) {
if((engine.statistics.totalFour == 1) || (engine.statistics.totalFour
== 2) || (engine.statistics.totalFour == 4)) {
engine.playSE("medal");
medalSK++;
@@ -759,7 +717,7 @@
}
// CO medal
- if(big == true) {
+ if(big.value) {
if((engine.combo >= 2) && (medalCO < 1)) {
engine.playSE("medal");
medalCO = 1;
@@ -808,7 +766,7 @@
// RO medal
roMedalCheck(engine);
- } else if((nextseclv == 500) && (engine.statistics.level >= 500) &&
(lv500torikan > 0) && (engine.statistics.time > lv500torikan)) {
+ } else if((nextseclv == 500) && (engine.statistics.level >= 500) &&
(lv500torikan.value > 0) && (engine.statistics.time > lv500torikan.value)) {
// level500とりカン
engine.playSE("endingstart");
engine.statistics.level = 500;
@@ -865,7 +823,7 @@
// Update level for next section
nextseclv += 100;
if(nextseclv > 999) nextseclv = 999;
- } else if((engine.statistics.level == nextseclv - 1) && (lvstopse ==
true)) {
+ } else if((engine.statistics.level == nextseclv - 1) &&
(lvstopse.value)) {
engine.playSE("levelstop");
}
@@ -1023,7 +981,7 @@
owner.replayProp.setProperty("speedmania.version", version);
// Update rankings
- if((owner.replayMode == false) && (startlevel == 0) && (big == false) &&
(engine.ai == null)) {
+ if((owner.replayMode == false) && (startlevel.value == 0) && (big.value
== false) && (engine.ai == null)) {
updateRanking(grade, engine.statistics.level, engine.statistics.time);
if(medalST == 3) updateBestSectionTime();
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Sat Nov 10
01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Mon Nov 26
08:57:10 2012
@@ -187,7 +187,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
if(gametype < 0) gametype = GAMETYPE_MAX - 1;
@@ -215,7 +215,7 @@
}
// A button (confirm)
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -227,12 +227,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java Mon Nov
26 08:57:10 2012
@@ -288,7 +288,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
goaltype += change;
if(goaltype < 0) goaltype = GAMETYPE_MAX - 1;
@@ -334,7 +334,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -355,14 +355,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java Mon Nov
26 08:57:10 2012
@@ -493,7 +493,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
goaltype += change;
if(goaltype < 0) goaltype = GAMETYPE_MAX - 1;
@@ -522,7 +522,7 @@
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -543,12 +543,12 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ToolVSMapEditMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ToolVSMapEditMode.java Mon
Nov 26 08:57:10 2012
@@ -176,7 +176,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
case 1:
case 2:
@@ -198,26 +198,26 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 0) {
+ if(menuCursor == 0) {
// EDIT
engine.enterFieldEdit();
- } else if(engine.statc[2] == 1) {
+ } else if(menuCursor == 1) {
// GRAY->?
grayToRandomColor(engine.field);
- } else if(engine.statc[2] == 2) {
+ } else if(menuCursor == 2) {
// CLEAR
engine.field.reset();
- } else if(engine.statc[2] == 3) {
+ } else if(menuCursor == 3) {
// SAVE
if((nowMapID >= 0) && (nowMapID < listFields.size())) {
listFields.get(nowMapID).copy(engine.field);
} else {
listFields.add(new Field(engine.field));
}
- } else if(engine.statc[2] == 4) {
+ } else if(menuCursor == 4) {
// LOAD
if((nowMapID >= 0) && (nowMapID < listFields.size())) {
engine.field.copy(listFields.get(nowMapID));
@@ -225,16 +225,16 @@
} else {
engine.field.reset();
}
- } else if(engine.statc[2] == 5) {
+ } else if(menuCursor == 5) {
// DELETE
if((nowMapID >= 0) && (nowMapID < listFields.size())) {
listFields.remove(nowMapID);
if(nowMapID >= listFields.size()) nowMapID = listFields.size();
}
- } else if(engine.statc[2] == 6) {
+ } else if(menuCursor == 6) {
// WRITE
saveAllMaps(nowMapSetID);
- } else if(engine.statc[2] == 7) {
+ } else if(menuCursor == 7) {
// READ
loadAllMaps(nowMapSetID);
nowMapID = 0;
@@ -243,11 +243,11 @@
}
// 終了
- if(engine.ctrl.isPress(Controller.BUTTON_D) &&
engine.ctrl.isPress(Controller.BUTTON_E) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPress(Controller.BUTTON_D) &&
engine.ctrl.isPress(Controller.BUTTON_E) && (menuTime >= 5)) {
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
return true;
}
@@ -257,33 +257,33 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
receiver.drawMenuFont(engine, playerID, 0, 1, "FIELD EDIT",
EventReceiver.COLOR_DARKBLUE);
- if((engine.statc[2] >= 0) && (engine.statc[2] <= 2)) {
- receiver.drawMenuFont(engine, playerID, 0, 2 + engine.statc[2], "b",
EventReceiver.COLOR_RED);
+ if((menuCursor >= 0) && (menuCursor <= 2)) {
+ receiver.drawMenuFont(engine, playerID, 0, 2 + menuCursor, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 1, 2, "[EDIT]", (engine.statc[2]
== 0));
- receiver.drawMenuFont(engine, playerID, 1, 3, "[GRAY->?]",
(engine.statc[2] == 1));
- receiver.drawMenuFont(engine, playerID, 1, 4, "[CLEAR]",
(engine.statc[2] == 2));
+ receiver.drawMenuFont(engine, playerID, 1, 2, "[EDIT]", (menuCursor ==
0));
+ receiver.drawMenuFont(engine, playerID, 1, 3, "[GRAY->?]", (menuCursor
== 1));
+ receiver.drawMenuFont(engine, playerID, 1, 4, "[CLEAR]", (menuCursor ==
2));
receiver.drawMenuFont(engine, playerID, 0, 6, "MAP DATA",
EventReceiver.COLOR_DARKBLUE);
if(listFields.size() > 0) {
- receiver.drawMenuFont(engine, playerID, 0, 7, nowMapID + "/" +
(listFields.size() - 1), (engine.statc[2] >= 3) && (engine.statc[2] <= 5));
+ receiver.drawMenuFont(engine, playerID, 0, 7, nowMapID + "/" +
(listFields.size() - 1), (menuCursor >= 3) && (menuCursor <= 5));
} else {
- receiver.drawMenuFont(engine, playerID, 0, 7, "NO MAPS",
(engine.statc[2] >= 3) && (engine.statc[2] <= 5));
+ receiver.drawMenuFont(engine, playerID, 0, 7, "NO MAPS", (menuCursor >=
3) && (menuCursor <= 5));
}
- if((engine.statc[2] >= 3) && (engine.statc[2] <= 5)) {
- receiver.drawMenuFont(engine, playerID, 0, 8 + engine.statc[2] -
3, "b", EventReceiver.COLOR_RED);
+ if((menuCursor >= 3) && (menuCursor <= 5)) {
+ receiver.drawMenuFont(engine, playerID, 0, 8 + menuCursor - 3, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 1, 8, "[SAVE]", (engine.statc[2]
== 3));
- receiver.drawMenuFont(engine, playerID, 1, 9, "[LOAD]", (engine.statc[2]
== 4));
- receiver.drawMenuFont(engine, playerID, 1, 10, "[DELETE]",
(engine.statc[2] == 5));
+ receiver.drawMenuFont(engine, playerID, 1, 8, "[SAVE]", (menuCursor ==
3));
+ receiver.drawMenuFont(engine, playerID, 1, 9, "[LOAD]", (menuCursor ==
4));
+ receiver.drawMenuFont(engine, playerID, 1, 10, "[DELETE]", (menuCursor
== 5));
receiver.drawMenuFont(engine, playerID, 0, 12, "MAP FILE",
EventReceiver.COLOR_DARKBLUE);
- receiver.drawMenuFont(engine, playerID, 0, 13, nowMapSetID + "/99",
(engine.statc[2] >= 6) && (engine.statc[2] <= 7));
- if((engine.statc[2] >= 6) && (engine.statc[2] <= 7)) {
- receiver.drawMenuFont(engine, playerID, 0, 14 + engine.statc[2] -
6, "b", EventReceiver.COLOR_RED);
+ receiver.drawMenuFont(engine, playerID, 0, 13, nowMapSetID + "/99",
(menuCursor >= 6) && (menuCursor <= 7));
+ if((menuCursor >= 6) && (menuCursor <= 7)) {
+ receiver.drawMenuFont(engine, playerID, 0, 14 + menuCursor - 6, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 1, 14, "[WRITE]",
(engine.statc[2] == 6));
- receiver.drawMenuFont(engine, playerID, 1, 15, "[READ]",
(engine.statc[2] == 7));
+ receiver.drawMenuFont(engine, playerID, 1, 14, "[WRITE]", (menuCursor ==
6));
+ receiver.drawMenuFont(engine, playerID, 1, 15, "[READ]", (menuCursor ==
7));
receiver.drawMenuFont(engine, playerID, 0, 19, "EXIT-> D+E",
EventReceiver.COLOR_ORANGE);
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java Sat Nov 10
01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java Mon Nov 26
08:57:10 2012
@@ -252,7 +252,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -337,15 +337,15 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 16) {
+ if(menuCursor == 16) {
loadPreset(engine, owner.modeConfig, presetNumber);
// NET: Signal options change
if(netIsNetPlay && (netNumSpectators > 0)) netSendOptions(engine);
- } else if(engine.statc[2] == 17) {
+ } else if(menuCursor == 17) {
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -370,17 +370,17 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 10;
+ if(menuTime >= 60) {
+ menuCursor = 10;
}
- if(engine.statc[3] >= 120) {
+ if(menuTime >= 120) {
return false;
}
}
@@ -396,7 +396,7 @@
if(netIsNetRankingDisplayMode) {
// NET: Netplay Ranking
netOnRenderNetPlayRanking(engine, playerID, receiver);
- } else if(engine.statc[2] < 10) {
+ } else if(menuCursor < 10) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSBattleMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSBattleMode.java Mon Nov
26 08:57:10 2012
@@ -482,7 +482,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -621,12 +621,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -643,28 +643,28 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 9;
+ if(menuTime >= 60) {
+ menuCursor = 9;
}
- if(engine.statc[3] >= 120) {
+ if(menuTime >= 120) {
engine.statc[4] = 1;
}
} else {
@@ -690,7 +690,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -702,7 +702,7 @@
drawMenu(engine, playerID, receiver, 14, EventReceiver.COLOR_GREEN, 7,
"LOAD", String.valueOf(presetNumber[playerID]),
"SAVE", String.valueOf(presetNumber[playerID]));
- } else if(engine.statc[2] < 19) {
+ } else if(menuCursor < 19) {
String strTSpinEnable = "";
if(version >= 4) {
if(tspinEnableType[playerID] == 0) strTSpinEnable = "OFF";
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSDigRaceMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSDigRaceMode.java Mon Nov
26 08:57:10 2012
@@ -187,7 +187,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -251,12 +251,12 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -272,16 +272,16 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
// Replay start
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 9;
+ if(menuTime >= 60) {
+ menuCursor = 9;
}
- if(engine.statc[3] >= 120) {
+ if(menuTime >= 120) {
engine.statc[4] = 1;
}
} else {
@@ -307,7 +307,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSLineRaceMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSLineRaceMode.java Mon Nov
26 08:57:10 2012
@@ -186,7 +186,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -248,12 +248,12 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -269,13 +269,13 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
// Replay start
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
engine.statc[4] = 1;
}
} else {
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/menu/AbstractMenuItem.java
Sat Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/menu/AbstractMenuItem.java
Mon Nov 26 08:57:10 2012
@@ -21,10 +21,11 @@
public abstract String getValueString();
/**
- * Change the attribute
- *
+ * Change the attribute.
+ *
* @param dir
- * Direction pressed: -1 = left, 1 = right
+ * Direction pressed: -1 = left, 1 = right.
+ * If 0, update without changing any settings.
* @param fast
* 0 by default, +1 if E held, +2 if F held.
*/
Author: Pooch...@gmail.com
Date: Mon Nov 26 08:57:10 2012
Log: Begin phasing out uses of engine.statc. (NOTE: I did a couple
Replace All operations in all mode classes: "engine.statc[2]"
-> "menuCursor" and "engine.statc[3]" -> "menuTime". These are untested!)
http://code.google.com/p/nullpomino/source/detail?r=906
Added:
/trunk/src/mu/nu/nullpo/game/subsystem/mode/menu/TimeMenuItem.java
Modified:
/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/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/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/ToolVSMapEditMode.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/mu/nu/nullpo/game/subsystem/mode/menu/AbstractMenuItem.java
=======================================
--- /dev/null
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/menu/TimeMenuItem.java Mon
Nov 26 08:57:10 2012
@@ -0,0 +1,34 @@
+package mu.nu.nullpo.game.subsystem.mode.menu;
+
+import mu.nu.nullpo.util.GeneralUtil;
+
+public class TimeMenuItem extends IntegerMenuItem {
+ public int increment;
+
+ public TimeMenuItem(String name, String displayName, int color,
+ int defaultValue, int min, int max) {
+ super(name, displayName, color, defaultValue, min, max);
+ increment = 60;
+ }
+
+ public TimeMenuItem(String name, String displayName, int color,
+ int defaultValue, int min, int max, int increment) {
+ super(name, displayName, color, defaultValue, min, max);
+ this.increment = increment;
+ }
+
+ @Override
+ public void change(int dir, int fast) {
+ int delta = dir * increment;
+ value += delta;
+ if (value < min)
+ value = max;
+ if (value > max)
+ value = min;
+ }
+
+ @Override
+ public String getValueString() {
+ return GeneralUtil.getTime(value);
+ }
+}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AbstractMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AbstractMode.java Mon Nov
26 08:57:10 2012
@@ -64,9 +64,17 @@
/** Name of mode in properties file */
protected String propName;
+
+ /** Position of cursor in menu */
+ protected int menuCursor;
+
+ /** Number of frames spent in menu */
+ protected int menuTime;
public AbstractMode() {
statcMenu = 0;
+ menuCursor = 0;
+ menuTime = 0;
menuColor = EventReceiver.COLOR_WHITE;
menuY = 0;
menu = new ArrayList<AbstractMenuItem>();
@@ -220,14 +228,14 @@
public void renderSetting(GameEngine engine, int playerID) {
//TODO: Custom page breaks
AbstractMenuItem menuItem;
- int pageNum = engine.statc[2] / 10;
+ int pageNum = menuCursor / 10;
int pageStart = pageNum * 10;
int endPage = Math.min(menu.size(), pageStart+10);
for (int i = pageStart; i < endPage; i++)
{
menuItem = menu.get(i);
receiver.drawMenuFont(engine, playerID, 0, i << 1,
menuItem.displayName, menuItem.color);
- if (engine.statc[2] == i && !engine.owner.replayMode)
+ if (menuCursor == i && !engine.owner.replayMode)
receiver.drawMenuFont(engine, playerID, 0, (i << 1) + 1, "b" +
menuItem.getValueString(), true);
else
receiver.drawMenuFont(engine, playerID, 1, (i << 1) + 1,
menuItem.getValueString());
@@ -280,14 +288,14 @@
protected int updateCursor (GameEngine engine, int maxCursor, int
playerID) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = maxCursor;
+ menuCursor--;
+ if(menuCursor < 0) menuCursor = maxCursor;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > maxCursor) engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > maxCursor) menuCursor = 0;
engine.playSE("cursor");
}
@@ -306,7 +314,7 @@
int fast = 0;
if (engine.ctrl.isPush(Controller.BUTTON_E)) fast++;
if (engine.ctrl.isPush(Controller.BUTTON_F)) fast += 2;
- menu.get(engine.statc[2]).change(change, fast);
+ menu.get(menuCursor).change(change, fast);
}
}
@@ -327,7 +335,7 @@
{
if ((i&1) == 0)
receiver.drawMenuFont(engine, playerID, 0, menuY, str[i], menuColor);
- else if (engine.statc[2] == statcMenu && !engine.owner.replayMode)
+ else if (menuCursor == statcMenu && !engine.owner.replayMode)
{
receiver.drawMenuFont(engine, playerID, 0, menuY, "b" + str[i], true);
statcMenu++;
@@ -352,7 +360,7 @@
for (int i = 0; i < str.length-1; i+= 2)
{
receiver.drawMenuFont(engine, playerID, 1, menuY, str[i] + ":",
menuColor);
- if (engine.statc[2] == statcMenu && !engine.owner.replayMode)
+ if (menuCursor == statcMenu && !engine.owner.replayMode)
{
receiver.drawMenuFont(engine, playerID, 0, menuY, "b", true);
receiver.drawMenuFont(engine, playerID, str[i].length()+2, menuY,
str[i+1], true);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java Mon
Nov 26 08:57:10 2012
@@ -199,7 +199,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
case 6:
@@ -278,14 +278,14 @@
}
if (engine.ctrl.isPush(Controller.BUTTON_A)) {
- if ((xyzzy == 573) && engine.statc[2] > 5) {
+ if ((xyzzy == 573) && menuCursor > 5) {
loadMapSetFever(engine, playerID, mapSet, true);
loadFeverMap(engine, new Random(), previewChain, previewSubset);
} else if (xyzzy == 9) {
engine.playSE("levelup");
xyzzy = 573;
loadMapSetFever(engine, playerID, mapSet, true);
- } else if (engine.statc[3] >= 5) {
+ } else if (menuTime >= 5) {
// 決定
engine.playSE("decide");
saveSetting(owner.modeConfig);
@@ -303,12 +303,12 @@
}
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
@@ -331,7 +331,7 @@
*/
@Override
public void renderSetting(GameEngine engine, int playerID) {
- if (engine.statc[2] <= 5) {
+ if (menuCursor <= 5) {
String strOutline = "";
if(outlinetype == 0) strOutline = "NORMAL";
if(outlinetype == 1) strOutline = "COLOR";
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java Mon Nov
26 08:57:10 2012
@@ -157,16 +157,16 @@
if(engine.owner.replayMode == false) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = 10;
- else if(engine.statc[2] == 1 && gametype != 2) engine.statc[2]--;
+ menuCursor--;
+ if(menuCursor < 0) menuCursor = 10;
+ else if(menuCursor == 1 && gametype != 2) menuCursor--;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 10) engine.statc[2] = 0;
- else if(engine.statc[2] == 1 && gametype != 2) engine.statc[2]++;
+ menuCursor++;
+ if(menuCursor > 10) menuCursor = 0;
+ else if(menuCursor == 1 && gametype != 2) menuCursor++;
engine.playSE("cursor");
}
@@ -178,7 +178,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
@@ -229,7 +229,7 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -241,14 +241,14 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
- else if(engine.statc[3] >= 120)
+ if(menuTime >= 60)
+ menuCursor = 9;
+ else if(menuTime >= 120)
return false;
}
@@ -260,7 +260,7 @@
*/
@Override
public void renderSetting(GameEngine engine, int playerID) {
- if (engine.statc[2] <= 8) {
+ if (menuCursor <= 8) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
"GAME TYPE", GAMETYPE_NAME[gametype]);
if (gametype == 2)
=======================================
---
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
Sat Nov 10 01:22:14 2012
+++
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
Mon Nov 26 08:57:10 2012
@@ -133,7 +133,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -308,12 +308,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 32) {
+ if(menuCursor == 32) {
loadPreset(engine, owner.modeConfig,
presetNumber[playerID], "bombbattle");
- } else if(engine.statc[2] == 33) {
+ } else if(menuCursor == 33) {
savePreset(engine, owner.modeConfig,
presetNumber[playerID], "bombbattle");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -330,32 +330,32 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 240)
+ if(menuTime >= 240)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 180)
- engine.statc[2] = 26;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 17;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 180)
+ menuCursor = 26;
+ else if(menuTime >= 120)
+ menuCursor = 17;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -379,7 +379,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -392,7 +392,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/4",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 17) {
+ } else if(menuCursor < 17) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"COUNTER", OJAMA_COUNTER_STRING[ojamaCounterMode[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
@@ -404,7 +404,7 @@
"HARD OJAMA", String.valueOf(ojamaHard[playerID]));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 2/4",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 26) {
+ } else if(menuCursor < 26) {
initMenu(EventReceiver.COLOR_CYAN, 17);
drawMenu(engine, playerID, receiver,
"X COLUMN", dangerColumnDouble[playerID] ? "3 AND 4" : "3 ONLY",
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Sat Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Mon Nov 26 08:57:10 2012
@@ -131,7 +131,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -269,12 +269,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 27) {
+ if(menuCursor == 27) {
loadPreset(engine, owner.modeConfig,
presetNumber[playerID], "digrace");
- } else if(engine.statc[2] == 28) {
+ } else if(menuCursor == 28) {
savePreset(engine, owner.modeConfig,
presetNumber[playerID], "digrace");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -289,17 +289,17 @@
if(engine.ctrl.isPush(Controller.BUTTON_B)) {
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 180)
+ if(menuTime >= 180)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 18;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 120)
+ menuCursor = 18;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -323,7 +323,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -336,7 +336,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/3",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 18) {
+ } else if(menuCursor < 18) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"COUNTER", OJAMA_COUNTER_STRING[ojamaCounterMode[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
Sat Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
Mon Nov 26 08:57:10 2012
@@ -155,7 +155,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -305,12 +305,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 28) {
+ if(menuCursor == 28) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID], "fever");
- } else if(engine.statc[2] == 29) {
+ } else if(menuCursor == 29) {
savePreset(engine, owner.modeConfig, presetNumber[playerID], "fever");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -325,19 +325,19 @@
if(engine.ctrl.isPush(Controller.BUTTON_B)) {
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 240)
+ if(menuTime >= 240)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 180)
- engine.statc[2] = 24;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 18;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 180)
+ menuCursor = 24;
+ else if(menuTime >= 120)
+ menuCursor = 18;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -361,7 +361,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -374,7 +374,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/4",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 18) {
+ } else if(menuCursor < 18) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"ZENKESHI", ZENKESHI_TYPE_NAMES[zenKeshiType[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
@@ -387,7 +387,7 @@
"X SHOW", GeneralUtil.getONorOFF(dangerColumnShowX[playerID]));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 2/4",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 25) {
+ } else if(menuCursor < 25) {
initMenu(EventReceiver.COLOR_PURPLE, 18);
drawMenu(engine, playerID, receiver,
"HANDICAP", String.valueOf(ojamaHandicap[playerID]),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java Mon
Nov 26 08:57:10 2012
@@ -277,7 +277,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -569,17 +569,17 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if ((xyzzy == 573) && engine.statc[2] > 43) {
+ if ((xyzzy == 573) && menuCursor > 43) {
loadFeverMap(engine, playerID, new Random(), previewChain[playerID],
previewSubset[playerID]);
} else if (xyzzy == 9 && playerID == 0) {
engine.playSE("levelup");
xyzzy = 573;
- } else if(engine.statc[2] == 42) {
+ } else if(menuCursor == 42) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID], "");
- } else if(engine.statc[2] == 43) {
+ } else if(menuCursor == 43) {
savePreset(engine, owner.modeConfig, presetNumber[playerID], "");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -600,34 +600,34 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 300)
+ if(menuTime >= 300)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 240)
- engine.statc[2] = 36;
- else if(engine.statc[3] >= 180)
- engine.statc[2] = 26;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 17;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 240)
+ menuCursor = 36;
+ else if(menuTime >= 180)
+ menuCursor = 26;
+ else if(menuTime >= 120)
+ menuCursor = 17;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -651,7 +651,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -664,7 +664,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 21, "PAGE 1/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 17) {
+ } else if(menuCursor < 17) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"COUNTER", OJAMA_COUNTER_STRING[ojamaCounterMode[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
@@ -676,7 +676,7 @@
"CHAINPOWER", newChainPower[playerID] ? "FEVER" : "CLASSIC");
receiver.drawMenuFont(engine, playerID, 0, 21, "PAGE 2/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 26) {
+ } else if(menuCursor < 26) {
initMenu(EventReceiver.COLOR_DARKBLUE, 17);
drawMenu(engine, playerID, receiver,
"OUTLINE", OUTLINE_TYPE_NAMES[outlineType[playerID]],
@@ -697,7 +697,7 @@
"ZK-BONUS", (zenKeshiType[playerID] == ZENKESHI_MODE_FEVER) ?
zenKeshiChain[playerID] + " CHAIN" : zenKeshiOjama[playerID] + "
OJAMA");
receiver.drawMenuFont(engine, playerID, 0, 21, "PAGE 3/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 36) {
+ } else if(menuCursor < 36) {
initMenu(big[playerID] ? EventReceiver.COLOR_WHITE :
EventReceiver.COLOR_PURPLE, 26);
drawMenu(engine, playerID, receiver,
"FEVER", (feverThreshold[playerID] == 0) ? "NONE" :
feverThreshold[playerID]+" PTS");
@@ -718,7 +718,7 @@
"SIDE METER", (ojamaMeter[playerID] || feverThreshold[playerID] ==
0) ? "OJAMA" : "FEVER");
receiver.drawMenuFont(engine, playerID, 0, 21, "PAGE 4/5",
EventReceiver.COLOR_YELLOW);
- } else if (engine.statc[2] < 44){
+ } else if (menuCursor < 44){
initMenu(EventReceiver.COLOR_PINK, 36);
drawMenu(engine, playerID, receiver,
"USE MAP", GeneralUtil.getONorOFF(useMap[playerID]),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java Mon
Nov 26 08:57:10 2012
@@ -291,23 +291,23 @@
// Configuration changes
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0){
- engine.statc[2] = 33;
+ menuCursor--;
+ if(menuCursor < 0){
+ menuCursor = 33;
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
}
- else if (engine.statc[2] == 31)
+ else if (menuCursor == 31)
engine.field = null;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 33) {
- engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > 33) {
+ menuCursor = 0;
engine.field = null;
}
- else if (engine.statc[2] == 32)
+ else if (menuCursor == 32)
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
engine.playSE("cursor");
}
@@ -324,7 +324,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -502,12 +502,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 30) {
+ if(menuCursor == 30) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID], "spf");
- } else if(engine.statc[2] == 31) {
+ } else if(menuCursor == 31) {
savePreset(engine, owner.modeConfig, presetNumber[playerID], "spf");
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -524,37 +524,37 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 300)
+ if(menuTime >= 300)
engine.statc[4] = 1;
- else if (engine.statc[3] == 240)
+ else if (menuTime == 240)
{
- engine.statc[2] = 32;
+ menuCursor = 32;
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
}
- else if(engine.statc[3] >= 180)
- engine.statc[2] = 24;
- else if(engine.statc[3] >= 120)
- engine.statc[2] = 17;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 180)
+ menuCursor = 24;
+ else if(menuTime >= 120)
+ menuCursor = 17;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -591,7 +591,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -604,7 +604,7 @@
"CLEAR DELAY", String.valueOf(engine.cascadeClearDelay));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 17) {
+ } else if(menuCursor < 17) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_CYAN, 9,
"COUNTER", OJAMA_COUNTER_STRING[ojamaCounterMode[playerID]],
"MAX ATTACK", String.valueOf(maxAttack[playerID]),
@@ -616,7 +616,7 @@
"X SHOW", GeneralUtil.getONorOFF(dangerColumnShowX[playerID]));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 2/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 24) {
+ } else if(menuCursor < 24) {
initMenu(EventReceiver.COLOR_CYAN, 17);
drawMenu(engine, playerID, receiver,
"COUNTDOWN", (ojamaCountdown[playerID] == 10) ? "NONE" :
@@ -634,7 +634,7 @@
drawMenu(engine, playerID, receiver, "CHAINPOWER",
newChainPower[playerID] ? "FEVER" : "CLASSIC");
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 3/5",
EventReceiver.COLOR_YELLOW);
- } else if(engine.statc[2] < 32) {
+ } else if(menuCursor < 32) {
initMenu(EventReceiver.COLOR_PINK, 24);
drawMenu(engine, playerID, receiver,
"USE MAP", GeneralUtil.getONorOFF(useMap[playerID]),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java Mon Nov
26 08:57:10 2012
@@ -312,7 +312,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
goaltype += change;
if(goaltype < 0) goaltype = GOAL_TABLE.length - 1;
@@ -400,15 +400,15 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 14) {
+ if(menuCursor == 14) {
loadPreset(engine, owner.modeConfig, presetNumber);
// NET: Signal options change
if(netIsNetPlay && (netNumSpectators > 0)) netSendOptions(engine);
- } else if(engine.statc[2] == 15) {
+ } else if(menuCursor == 15) {
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -433,14 +433,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
@@ -456,7 +456,7 @@
if(netIsNetRankingDisplayMode) {
// NET: Netplay Ranking
netOnRenderNetPlayRanking(engine, playerID, receiver);
- } else if(engine.statc[2] < 6) {
+ } else if(menuCursor < 6) {
String strSpawn = spawnAboveField ? "ABOVE" : "BELOW";
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java Mon
Nov 26 08:57:10 2012
@@ -233,7 +233,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
goaltype += change;
if(goaltype < 0) goaltype = GOALTYPE_MAX - 1;
@@ -284,7 +284,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
// Save settings
@@ -307,14 +307,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java Sat Nov 10
01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java Mon Nov 26
08:57:10 2012
@@ -190,7 +190,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -251,10 +251,10 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 9) {
+ if(menuCursor == 9) {
// Load preset
loadPreset(engine, owner.modeConfig, presetNumber);
@@ -262,7 +262,7 @@
if(netIsNetPlay && (netNumSpectators > 0)) {
netSendOptions(engine);
}
- } else if(engine.statc[2] == 10) {
+ } else if(menuCursor == 10) {
// Save preset
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
@@ -290,14 +290,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java Sat Nov 10
01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java Mon Nov 26
08:57:10 2012
@@ -240,7 +240,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 19;
@@ -285,7 +285,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -307,14 +307,14 @@
netEnterNetPlayRankingScreen(engine, playerID, netGetGoalType());
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java Sat Nov 10
01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java Mon Nov 26
08:57:10 2012
@@ -355,7 +355,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 9;
@@ -375,13 +375,13 @@
}
// Check for F button, when pressed this will flip Leaderboard/Best
Section Time Records
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -395,12 +395,12 @@
sectionscomp = 0;
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java Mon
Nov 26 08:57:10 2012
@@ -387,7 +387,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 9;
@@ -413,13 +413,13 @@
}
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -433,12 +433,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GemManiaMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GemManiaMode.java Mon Nov
26 08:57:10 2012
@@ -557,7 +557,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
break;
case 1:
@@ -576,14 +576,14 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
editModeScreen = 2;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
break;
case 1:
if((propStageSet != null) && (engine.field != null)) {
@@ -608,24 +608,24 @@
// Cancel
if(engine.ctrl.isPress(Controller.BUTTON_D) &&
engine.ctrl.isPress(Controller.BUTTON_E)) {
editModeScreen = 0;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
}
- engine.statc[3]++;
+ menuTime++;
}
// エディットMenu stage 画面
else if(editModeScreen == 2) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = 4;
+ menuCursor--;
+ if(menuCursor < 0) menuCursor = 4;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 4) engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > 4) menuCursor = 0;
engine.playSE("cursor");
}
@@ -641,7 +641,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
break;
case 1:
@@ -668,40 +668,40 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 0) {
+ if(menuCursor == 0) {
engine.enterFieldEdit();
return true;
} else {
editModeScreen = 1;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
}
}
// Cancel
- if(engine.ctrl.isPush(Controller.BUTTON_B) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_B) && (menuTime >= 5)) {
editModeScreen = 1;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
}
- engine.statc[3]++;
+ menuTime++;
}
// 普通のMenu
else if(engine.owner.replayMode == false) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = 8;
+ menuCursor--;
+ if(menuCursor < 0) menuCursor = 8;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 8) engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > 8) menuCursor = 0;
engine.playSE("cursor");
}
@@ -713,7 +713,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startstage += change;
if(startstage < 0) startstage = MAX_STAGE_TOTAL - 1;
@@ -763,7 +763,7 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -784,16 +784,16 @@
engine.field.setAllSkin(engine.getSkin());
editModeScreen = 1;
- engine.statc[2] = 0;
- engine.statc[3] = 0;
+ menuCursor = 0;
+ menuTime = 0;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java Mon
Nov 26 08:57:10 2012
@@ -538,13 +538,13 @@
owner.backgroundStatus.bg = Math.min(9, startlevel.value);
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -558,12 +558,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java Mon
Nov 26 08:57:10 2012
@@ -722,7 +722,7 @@
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 11;
@@ -787,13 +787,13 @@
}
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -834,12 +834,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
@@ -1643,7 +1643,7 @@
int gcolor = EventReceiver.COLOR_WHITE;
if((rollclear == 1) || (rollclear == 3)) gcolor =
EventReceiver.COLOR_GREEN;
if((rollclear == 2) || (rollclear == 4)) gcolor =
EventReceiver.COLOR_ORANGE;
- if((grade >= 32) && (engine.statc[2] % 2 == 0)) gcolor =
EventReceiver.COLOR_YELLOW;
+ if((grade >= 32) && (menuCursor % 2 == 0)) gcolor =
EventReceiver.COLOR_YELLOW;
receiver.drawMenuFont(engine, playerID, 0, 2, "GRADE",
EventReceiver.COLOR_BLUE);
String strGrade = String.format("%10s", getGradeName(rgrade));
receiver.drawMenuFont(engine, playerID, 0, 3, strGrade, gcolor);
@@ -1750,7 +1750,7 @@
isShowBestSectionTime = !isShowBestSectionTime;
}
- engine.statc[2]++;
+ menuCursor++;
return false;
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java Mon Nov
26 08:57:10 2012
@@ -345,13 +345,13 @@
owner.backgroundStatus.bg = Math.min(9, startlevel.value);
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -365,12 +365,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/LegacyNetVSBattleMode.java
Sat Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/LegacyNetVSBattleMode.java
Mon Nov 26 08:57:10 2012
@@ -983,13 +983,13 @@
if((netLobby != null) && (netLobby.netPlayerClient != null)) {
if((!isReadyChangePending) && (numPlayers >= 2)) {
// Ready ON
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)
&& (isReady[0] == false) && (!currentRoomInfo.playing)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5) &&
(isReady[0] == false) && (!currentRoomInfo.playing)) {
engine.playSE("decide");
isReadyChangePending = true;
netLobby.netPlayerClient.send("ready\ttrue\n");
}
// Ready OFF
- if(engine.ctrl.isPush(Controller.BUTTON_B) && (engine.statc[3] >= 5)
&& (isReady[0] == true) && (!currentRoomInfo.playing)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_B) && (menuTime >= 5) &&
(isReady[0] == true) && (!currentRoomInfo.playing)) {
engine.playSE("change");
isReadyChangePending = true;
netLobby.netPlayerClient.send("ready\tfalse\n");
@@ -998,7 +998,7 @@
// Random map preview
if((currentRoomInfo != null) && currentRoomInfo.useMap
&& !netLobby.mapList.isEmpty()) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= netLobby.mapList.size()) engine.statc[5] = 0;
engine.createFieldIfNeeded();
@@ -1011,18 +1011,18 @@
}
// Practice mode
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("decide");
startPractice(engine);
}
}
// GC呼び出し
- if(engine.statc[3] == 0) {
+ if(menuTime == 0) {
System.gc();
}
- engine.statc[3]++;
+ menuTime++;
}
return true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/LineRaceMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/LineRaceMode.java Mon Nov
26 08:57:10 2012
@@ -183,7 +183,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -247,10 +247,10 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5) &&
(!netIsWatch)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5) &&
(!netIsWatch)) {
engine.playSE("decide");
- if(engine.statc[2] == 10) {
+ if(menuCursor == 10) {
// Load preset
loadPreset(engine, owner.modeConfig, presetNumber);
@@ -258,7 +258,7 @@
if(netIsNetPlay && (netNumSpectators > 0)) {
netSendOptions(engine);
}
- } else if(engine.statc[2] == 11) {
+ } else if(menuCursor == 11) {
// Save preset
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
@@ -285,14 +285,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java Mon Nov
26 08:57:10 2012
@@ -223,7 +223,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(tableGameClearLines[goaltype] >= 0) {
@@ -280,7 +280,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -302,14 +302,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java Sat
Nov 10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java Mon
Nov 26 08:57:10 2012
@@ -254,7 +254,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 20;
@@ -297,7 +297,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -319,14 +319,14 @@
netEnterNetPlayRankingScreen(engine, playerID, netGetGoalType());
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyMode.java Mon Nov
26 08:57:10 2012
@@ -311,7 +311,7 @@
*/
@Override
public boolean onEndingStart(GameEngine engine, int playerID) {
- if(engine.statc[2] == 0) {
+ if(menuCursor == 0) {
// NET: Send game completed messages
if(netIsNetPlay && !netIsWatch && ((netNumSpectators > 0) ||
(netForceSendMovements))) {
netSendField(engine);
@@ -431,7 +431,7 @@
if((engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP) ||
engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) &&
netIsNetPlay && ((netNumSpectators > 0) || (netForceSendMovements)))
{
- netLobby.netPlayerClient.send("game\tcursor\t" + engine.statc[2]
+ "\n");
+ netLobby.netPlayerClient.send("game\tcursor\t" + menuCursor + "\n");
}
return change;
@@ -551,7 +551,7 @@
// Move cursor
if(message[3].equals("cursor")) {
if(engine.stat == GameEngine.STAT_SETTING) {
- engine.statc[2] = Integer.parseInt(message[4]);
+ menuCursor = Integer.parseInt(message[4]);
engine.playSE("cursor");
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyVSMode.java Wed
Mar 2 00:15:52 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetDummyVSMode.java Mon Nov
26 08:57:10 2012
@@ -678,7 +678,7 @@
engine.enableSE = true;
engine.isVisible = true;
- if((!netvsIsReadyChangePending) && (netvsNumPlayers >= 2) &&
(!netvsIsNewcomer) && (engine.statc[3] >= 5)) {
+ if((!netvsIsReadyChangePending) && (netvsNumPlayers >= 2) &&
(!netvsIsNewcomer) && (menuTime >= 5)) {
// Ready ON
if(engine.ctrl.isPush(Controller.BUTTON_A) && !netvsPlayerReady[0]) {
engine.playSE("decide");
@@ -694,7 +694,7 @@
}
// Practice Mode
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("decide");
netvsStartPractice(engine);
return true;
@@ -704,7 +704,7 @@
// Random Map Preview
if((netCurrentRoomInfo != null) && netCurrentRoomInfo.useMap
&& !netLobby.mapList.isEmpty()) {
if(netvsPlayerExist[playerID]) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= netLobby.mapList.size()) engine.statc[5] = 0;
engine.createFieldIfNeeded();
@@ -719,7 +719,7 @@
}
}
- engine.statc[3]++;
+ menuTime++;
return true;
}
@@ -757,7 +757,7 @@
}
}
- if((playerID == 0) && !netvsIsWatch() && (engine.statc[3] >= 5)) {
+ if((playerID == 0) && !netvsIsWatch() && (menuTime >= 5)) {
String strTemp = "F(" + owner.receiver.getKeyNameByButtonID(engine,
Controller.BUTTON_F) + " KEY):";
if(strTemp.length() > 10) strTemp = strTemp.substring(0, 10);
strTemp = strTemp.toUpperCase();
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java Mon
Nov 26 08:57:10 2012
@@ -31,6 +31,9 @@
import mu.nu.nullpo.game.component.Controller;
import mu.nu.nullpo.game.event.EventReceiver;
import mu.nu.nullpo.game.play.GameEngine;
+import mu.nu.nullpo.game.subsystem.mode.menu.BooleanMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.IntegerMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.OnOffMenuItem;
import mu.nu.nullpo.util.CustomProperties;
import mu.nu.nullpo.util.GeneralUtil;
@@ -186,16 +189,16 @@
private boolean isShowBestSectionTime;
/** Selected start level */
- private int startlevel;
+ private IntegerMenuItem startlevel;
/** Enable/Disable level stop sfx */
- private boolean lvstopse;
+ private BooleanMenuItem lvstopse;
/** Big mode */
- private boolean big;
+ private BooleanMenuItem big;
/** Show section time */
- private boolean showsectiontime;
+ private BooleanMenuItem showsectiontime;
/** Version of this mode */
private int version;
@@ -218,6 +221,23 @@
/** Best section time records */
private int[] bestSectionTime;
+ public PhantomManiaMode()
+ {
+ propName = "phantommania";
+
+ startlevel = new IntegerMenuItem("startlevel", "LEVEL",
EventReceiver.COLOR_BLUE, 0, 0, 9) {
+ public String getValueString() {
+ return String.valueOf(value * 100);
+ }
+ };
+ lvstopse = new OnOffMenuItem("lvstopse", "LVSTOPSE",
EventReceiver.COLOR_BLUE, false);
+ big = new OnOffMenuItem("big", "BIG", EventReceiver.COLOR_BLUE, false);
+ showsectiontime = new OnOffMenuItem("big", "BIG",
EventReceiver.COLOR_BLUE, true);
+ menu.add(startlevel);
+ menu.add(lvstopse);
+ menu.add(showsectiontime);
+ menu.add(big);
+ }
/**
* Returns the name of this mode
*/
@@ -260,10 +280,6 @@
recoveryFlag = false;
rotateCount = 0;
isShowBestSectionTime = false;
- startlevel = 0;
- lvstopse = false;
- big = false;
- showsectiontime = true;
rankingRank = -1;
rankingGrade = new int[RANKING_MAX];
@@ -294,27 +310,7 @@
version = owner.replayProp.getProperty("phantommania.version", 0);
}
- owner.backgroundStatus.bg = startlevel;
- }
-
- /**
- * Load the settings
- */
- protected void loadSetting(CustomProperties prop) {
- startlevel = prop.getProperty("phantommania.startlevel", 0);
- lvstopse = prop.getProperty("phantommania.lvstopse", false);
- showsectiontime = prop.getProperty("phantommania.showsectiontime", true);
- big = prop.getProperty("phantommania.big", false);
- }
-
- /**
- * Save the settings
- */
- protected void saveSetting(CustomProperties prop) {
- prop.setProperty("phantommania.startlevel", startlevel);
- prop.setProperty("phantommania.lvstopse", lvstopse);
- prop.setProperty("phantommania.showsectiontime", showsectiontime);
- prop.setProperty("phantommania.big", big);
+ owner.backgroundStatus.bg = startlevel.value;
}
/**
@@ -347,7 +343,7 @@
private void setAverageSectionTime() {
if(sectionscomp > 0) {
int temp = 0;
- for(int i = startlevel; i < startlevel + sectionscomp; i++) temp +=
sectiontime[i];
+ for(int i = startlevel.value; i < startlevel.value + sectionscomp; i++)
temp += sectiontime[i];
sectionavgtime = temp / sectionscomp;
} else {
sectionavgtime = 0;
@@ -407,39 +403,17 @@
@Override
public boolean onSetting(GameEngine engine, int playerID) {
if(engine.owner.replayMode == false) {
- // Configuration changes
- int change = updateCursor(engine, 3);
-
- if(change != 0) {
- receiver.playSE("change");
-
- switch(engine.statc[2]) {
- case 0:
- startlevel += change;
- if(startlevel < 0) startlevel = 9;
- if(startlevel > 9) startlevel = 0;
- owner.backgroundStatus.bg = startlevel;
- break;
- case 1:
- lvstopse = !lvstopse;
- break;
- case 2:
- showsectiontime = !showsectiontime;
- break;
- case 3:
- big = !big;
- break;
- }
- }
+ updateMenu(engine);
+ owner.backgroundStatus.bg = startlevel.value;
// Check for F button, when pressed this will flip Leaderboard/Best
Section Time Records
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -452,37 +426,25 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
return true;
}
-
- /**
- * Renders game setup screen
- */
- @Override
- public void renderSetting(GameEngine engine, int playerID) {
- drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
- "LEVEL", String.valueOf(startlevel * 100),
- "LVSTOPSE", GeneralUtil.getONorOFF(lvstopse),
- "SHOW STIME", GeneralUtil.getONorOFF(showsectiontime),
- "BIG", GeneralUtil.getONorOFF(big));
- }
/**
* This function will be called before the game actually begins (after
Ready&Go screen disappears)
*/
@Override
public void startGame(GameEngine engine, int playerID) {
- engine.statistics.level = startlevel * 100;
+ engine.statistics.level = startlevel.value * 100;
nextseclv = engine.statistics.level + 100;
if(engine.statistics.level < 0) nextseclv = 100;
@@ -490,7 +452,7 @@
owner.backgroundStatus.bg = engine.statistics.level / 100;
- engine.big = big;
+ engine.big = big.value;
setSpeed(engine);
setStartBgmlv(engine);
@@ -507,7 +469,7 @@
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((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (engine.ai == null)) {
+ if((owner.replayMode == false) && (startlevel.value == 0) &&
(!big.value) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Leaderboard
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
@@ -595,7 +557,7 @@
if(medalRO >= 1) receiver.drawScoreFont(engine, playerID, 0, 22, "RO",
getMedalFontColor(medalRO));
if(medalCO >= 1) receiver.drawScoreFont(engine, playerID, 3, 22, "CO",
getMedalFontColor(medalCO));
- if((showsectiontime == true) && (sectiontime != null)) {
+ if(showsectiontime.value && (sectiontime != null)) {
int x = (receiver.getNextDisplayType() == 2) ? 8 : 12;
int x2 = (receiver.getNextDisplayType() == 2) ? 9 : 12;
@@ -633,7 +595,7 @@
if((engine.ending == 0) && (engine.statc[0] == 0) && (engine.holdDisable
== false) && (!lvupflag)) {
if(engine.statistics.level < nextseclv - 1) {
engine.statistics.level++;
- if((engine.statistics.level == nextseclv - 1) && (lvstopse == true))
owner.receiver.playSE("levelstop");
+ if((engine.statistics.level == nextseclv - 1) && lvstopse.value)
owner.receiver.playSE("levelstop");
}
levelUp(engine);
@@ -672,7 +634,7 @@
if((engine.ending == 0) && (engine.statc[0] >= engine.statc[1] - 1) &&
(!lvupflag)) {
if(engine.statistics.level < nextseclv - 1) {
engine.statistics.level++;
- if((engine.statistics.level == nextseclv - 1) && (lvstopse == true))
owner.receiver.playSE("levelstop");
+ if((engine.statistics.level == nextseclv - 1) && lvstopse.value)
owner.receiver.playSE("levelstop");
}
levelUp(engine);
lvupflag = true;
@@ -718,7 +680,7 @@
if(lines >= 4) {
sectionfourline++;
- if(big == true) {
+ if(big.value) {
if((engine.statistics.totalFour == 1) || (engine.statistics.totalFour
== 2) || (engine.statistics.totalFour == 4)) {
receiver.playSE("medal");
medalSK++;
@@ -740,7 +702,7 @@
}
}
- if(big == true) {
+ if(big.value) {
if((engine.combo >= 2) && (medalCO < 1)) {
receiver.playSE("medal");
medalCO = 1;
@@ -879,7 +841,7 @@
if((nextseclv == 300) || (nextseclv == 700)) roMedalCheck(engine);
- if (startlevel == 0)
+ if (startlevel.value == 0)
{
for (int i = 0; i < tableGradeLevel.length - 1; i++)
{
@@ -892,7 +854,7 @@
nextseclv += 100;
if(nextseclv > 999) nextseclv = 999;
- } else if((engine.statistics.level == nextseclv - 1) && (lvstopse ==
true)) {
+ } else if((engine.statistics.level == nextseclv - 1) && lvstopse.value)
{
receiver.playSE("levelstop");
}
@@ -1046,7 +1008,7 @@
saveSetting(owner.replayProp);
owner.replayProp.setProperty("phantommania.version", version);
- if((owner.replayMode == false) && (startlevel == 0) && (big == false) &&
(engine.ai == null)) {
+ if((owner.replayMode == false) && (startlevel.value == 0) &&
(!big.value) && (engine.ai == null)) {
updateRanking(grade, engine.statistics.level, engine.statistics.time,
rollclear);
if(medalST == 3) updateBestSectionTime();
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Mon Nov
26 08:57:10 2012
@@ -186,7 +186,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
if (m >= 10) hoverBlocks += change*10;
@@ -202,7 +202,7 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -214,12 +214,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianVSMode.java Mon
Nov 26 08:57:10 2012
@@ -401,7 +401,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -496,12 +496,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -518,28 +518,28 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 120)
+ if(menuTime >= 120)
engine.statc[4] = 1;
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -563,7 +563,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
initMenu(EventReceiver.COLOR_ORANGE, 0);
drawMenu(engine, playerID, receiver,
"GRAVITY", String.valueOf(engine.speed.gravity),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PracticeMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PracticeMode.java Mon Nov
26 08:57:10 2012
@@ -407,7 +407,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -585,14 +585,14 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 41) {
+ if(menuCursor == 41) {
// fieldエディット
engine.enterFieldEdit();
return true;
- } else if(engine.statc[2] == 42) {
+ } else if(menuCursor == 42) {
// Map読み込み
engine.createFieldIfNeeded();
engine.field.reset();
@@ -602,17 +602,17 @@
loadMap(engine.field, prop, 0);
engine.field.setAllSkin(engine.getSkin());
}
- } else if(engine.statc[2] == 43) {
+ } else if(menuCursor == 43) {
// Map保存
if(engine.field != null) {
CustomProperties prop = new CustomProperties();
saveMap(engine.field, prop, 0);
receiver.saveProperties("config/map/practice/" + mapNumber + ".map",
prop);
}
- } else if(engine.statc[2] == 44) {
+ } else if(menuCursor == 44) {
// Preset読み込み
loadPreset(engine, owner.modeConfig, presetNumber);
- } else if(engine.statc[2] == 45) {
+ } else if(menuCursor == 45) {
// Preset保存
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
@@ -644,17 +644,17 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
owner.menuOnly = true;
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 22;
+ if(menuTime >= 60) {
+ menuCursor = 22;
}
- if((engine.statc[3] >= 120) || engine.ctrl.isPush(Controller.BUTTON_F))
{
+ if((menuTime >= 120) || engine.ctrl.isPush(Controller.BUTTON_F)) {
owner.menuOnly = false;
return false;
}
@@ -676,21 +676,21 @@
receiver.drawMenuFont(engine, playerID, 1, 27, "F:SKIP",
EventReceiver.COLOR_RED);
}
- if(engine.statc[2] < 23) {
+ if(menuCursor < 23) {
if(owner.replayMode == false) {
- receiver.drawMenuFont(engine, playerID, 1, engine.statc[2] + 3, "b",
EventReceiver.COLOR_RED);
+ receiver.drawMenuFont(engine, playerID, 1, menuCursor + 3, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 2, 3, "GRAVITY:" +
engine.speed.gravity, (engine.statc[2] == 0));
- receiver.drawMenuFont(engine, playerID, 2, 4, "G-MAX:" +
engine.speed.denominator, (engine.statc[2] == 1));
- receiver.drawMenuFont(engine, playerID, 2, 5, "ARE:" +
engine.speed.are, (engine.statc[2] == 2));
- receiver.drawMenuFont(engine, playerID, 2, 6, "ARE LINE:" +
engine.speed.areLine, (engine.statc[2] == 3));
- receiver.drawMenuFont(engine, playerID, 2, 7, "LINE DELAY:" +
engine.speed.lineDelay, (engine.statc[2] == 4));
- receiver.drawMenuFont(engine, playerID, 2, 8, "LOCK DELAY:" +
engine.speed.lockDelay, (engine.statc[2] == 5));
- receiver.drawMenuFont(engine, playerID, 2, 9, "DAS:" +
engine.speed.das, (engine.statc[2] == 6));
- receiver.drawMenuFont(engine, playerID, 2, 10, "BGM:" + bgmno,
(engine.statc[2] == 7));
- receiver.drawMenuFont(engine, playerID, 2, 11, "BIG:" +
GeneralUtil.getONorOFF(big), (engine.statc[2] == 8));
- receiver.drawMenuFont(engine, playerID, 2, 12, "LEVEL TYPE:" +
LEVELTYPE_STRING[leveltype], (engine.statc[2] == 9));
+ receiver.drawMenuFont(engine, playerID, 2, 3, "GRAVITY:" +
engine.speed.gravity, (menuCursor == 0));
+ receiver.drawMenuFont(engine, playerID, 2, 4, "G-MAX:" +
engine.speed.denominator, (menuCursor == 1));
+ receiver.drawMenuFont(engine, playerID, 2, 5, "ARE:" +
engine.speed.are, (menuCursor == 2));
+ receiver.drawMenuFont(engine, playerID, 2, 6, "ARE LINE:" +
engine.speed.areLine, (menuCursor == 3));
+ receiver.drawMenuFont(engine, playerID, 2, 7, "LINE DELAY:" +
engine.speed.lineDelay, (menuCursor == 4));
+ receiver.drawMenuFont(engine, playerID, 2, 8, "LOCK DELAY:" +
engine.speed.lockDelay, (menuCursor == 5));
+ receiver.drawMenuFont(engine, playerID, 2, 9, "DAS:" +
engine.speed.das, (menuCursor == 6));
+ receiver.drawMenuFont(engine, playerID, 2, 10, "BGM:" + bgmno,
(menuCursor == 7));
+ receiver.drawMenuFont(engine, playerID, 2, 11, "BIG:" +
GeneralUtil.getONorOFF(big), (menuCursor == 8));
+ receiver.drawMenuFont(engine, playerID, 2, 12, "LEVEL TYPE:" +
LEVELTYPE_STRING[leveltype], (menuCursor == 9));
String strTSpinEnable = "";
if(version >= 4) {
if(tspinEnableType == 0) strTSpinEnable = "OFF";
@@ -699,15 +699,15 @@
} else {
strTSpinEnable = GeneralUtil.getONorOFF(enableTSpin);
}
- receiver.drawMenuFont(engine, playerID, 2, 13, "SPIN BONUS:" +
strTSpinEnable, (engine.statc[2] == 10));
- receiver.drawMenuFont(engine, playerID, 2, 14, "EZ SPIN:" +
GeneralUtil.getONorOFF(enableTSpinKick), (engine.statc[2] == 11));
- receiver.drawMenuFont(engine, playerID, 2, 15, "SPIN TYPE:" +
((spinCheckType == 0) ? "4POINT" : "IMMOBILE"), (engine.statc[2] == 12));
- receiver.drawMenuFont(engine, playerID, 2, 16, "EZ IMMOBILE:" +
GeneralUtil.getONorOFF(tspinEnableEZ), (engine.statc[2] == 13));
- receiver.drawMenuFont(engine, playerID, 2, 17, "B2B:" +
GeneralUtil.getONorOFF(enableB2B), (engine.statc[2] == 14));
- receiver.drawMenuFont(engine, playerID, 2, 18, "COMBO:" +
COMBOTYPE_STRING[comboType], (engine.statc[2] == 15));
- receiver.drawMenuFont(engine, playerID, 2, 19, "LEVEL STOP SE:" +
GeneralUtil.getONorOFF(lvstopse), (engine.statc[2] == 16));
- receiver.drawMenuFont(engine, playerID, 2, 20, "BIG MOVE:" +
(bigmove ? "2 CELL" : "1 CELL"), (engine.statc[2] == 17));
- receiver.drawMenuFont(engine, playerID, 2, 21, "BIG HALF:" +
GeneralUtil.getONorOFF(bighalf), (engine.statc[2] == 18));
+ receiver.drawMenuFont(engine, playerID, 2, 13, "SPIN BONUS:" +
strTSpinEnable, (menuCursor == 10));
+ receiver.drawMenuFont(engine, playerID, 2, 14, "EZ SPIN:" +
GeneralUtil.getONorOFF(enableTSpinKick), (menuCursor == 11));
+ receiver.drawMenuFont(engine, playerID, 2, 15, "SPIN TYPE:" +
((spinCheckType == 0) ? "4POINT" : "IMMOBILE"), (menuCursor == 12));
+ receiver.drawMenuFont(engine, playerID, 2, 16, "EZ IMMOBILE:" +
GeneralUtil.getONorOFF(tspinEnableEZ), (menuCursor == 13));
+ receiver.drawMenuFont(engine, playerID, 2, 17, "B2B:" +
GeneralUtil.getONorOFF(enableB2B), (menuCursor == 14));
+ receiver.drawMenuFont(engine, playerID, 2, 18, "COMBO:" +
COMBOTYPE_STRING[comboType], (menuCursor == 15));
+ receiver.drawMenuFont(engine, playerID, 2, 19, "LEVEL STOP SE:" +
GeneralUtil.getONorOFF(lvstopse), (menuCursor == 16));
+ receiver.drawMenuFont(engine, playerID, 2, 20, "BIG MOVE:" +
(bigmove ? "2 CELL" : "1 CELL"), (menuCursor == 17));
+ receiver.drawMenuFont(engine, playerID, 2, 21, "BIG HALF:" +
GeneralUtil.getONorOFF(bighalf), (menuCursor == 18));
String strGoalLv = "ENDLESS";
if(goallv >= 0) {
if((leveltype == LEVELTYPE_MANIA) || (leveltype ==
LEVELTYPE_MANIAPLUS))
@@ -717,48 +717,48 @@
else
strGoalLv = "LV" + String.valueOf(goallv + 1);
}
- receiver.drawMenuFont(engine, playerID, 2, 22, "GOAL LEVEL:" +
strGoalLv, (engine.statc[2] == 19));
+ receiver.drawMenuFont(engine, playerID, 2, 22, "GOAL LEVEL:" +
strGoalLv, (menuCursor == 19));
receiver.drawMenuFont(engine, playerID, 2, 23, "TIME LIMIT:" +
((timelimit == 0) ? "NONE" : GeneralUtil.getTime(timelimit)),
- (engine.statc[2] == 20));
+ (menuCursor == 20));
receiver.drawMenuFont(engine, playerID, 2, 24, "ROLL LIMIT:" +
((rolltimelimit == 0) ? "NONE" : GeneralUtil.getTime(rolltimelimit)),
- (engine.statc[2] == 21));
+ (menuCursor == 21));
receiver.drawMenuFont(engine, playerID, 2, 25, "TIME LIMIT RESET EVERY
LEVEL:" + GeneralUtil.getONorOFF(timelimitResetEveryLevel),
- (engine.statc[2] == 22));
- } else if(engine.statc[2] < 46) {
+ (menuCursor == 22));
+ } else if(menuCursor < 46) {
if(owner.replayMode == false) {
- receiver.drawMenuFont(engine, playerID, 1, engine.statc[2] - 23 +
3, "b", EventReceiver.COLOR_RED);
+ receiver.drawMenuFont(engine, playerID, 1, menuCursor - 23 + 3, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 2, 3, "USE BONE BLOCKS:" +
GeneralUtil.getONorOFF(bone), (engine.statc[2] == 23));
+ receiver.drawMenuFont(engine, playerID, 2, 3, "USE BONE BLOCKS:" +
GeneralUtil.getONorOFF(bone), (menuCursor == 23));
String strHiddenFrames = "NONE";
if(blockHidden == -2) strHiddenFrames = "LOCK FLASH (" +
engine.ruleopt.lockflash + "F)";
if(blockHidden >= 0) strHiddenFrames = String.format("%d (%.2f SEC.)",
blockHidden, (float)(blockHidden / 60f));
- receiver.drawMenuFont(engine, playerID, 2, 4, "BLOCK HIDDEN FRAMES:" +
strHiddenFrames, (engine.statc[2] == 24));
+ receiver.drawMenuFont(engine, playerID, 2, 4, "BLOCK HIDDEN FRAMES:" +
strHiddenFrames, (menuCursor == 24));
receiver.drawMenuFont(engine, playerID, 2, 5, "BLOCK HIDDEN ANIM:" +
GeneralUtil.getONorOFF(blockHiddenAnim),
- (engine.statc[2] == 25));
+ (menuCursor == 25));
receiver.drawMenuFont(engine, playerID, 2, 6, "BLOCK OUTLINE TYPE:" +
BLOCK_OUTLINE_TYPE_STRING[blockOutlineType],
- (engine.statc[2] == 26));
+ (menuCursor == 26));
receiver.drawMenuFont(engine, playerID, 2, 7, "BLOCK OUTLINE ONLY:" +
GeneralUtil.getONorOFF(blockShowOutlineOnly),
- (engine.statc[2] == 27));
+ (menuCursor == 27));
receiver.drawMenuFont(engine, playerID, 2, 8, "HEBO HIDDEN:" +
((heboHiddenLevel == 0) ? "NONE" : "LV"+heboHiddenLevel),
- (engine.statc[2] == 28));
- receiver.drawMenuFont(engine, playerID, 2, 9, "PIECE I:" +
GeneralUtil.getONorOFF(pieceEnable[0]), (engine.statc[2] == 29));
- receiver.drawMenuFont(engine, playerID, 2, 10, "PIECE L:" +
GeneralUtil.getONorOFF(pieceEnable[1]), (engine.statc[2] == 30));
- receiver.drawMenuFont(engine, playerID, 2, 11, "PIECE O:" +
GeneralUtil.getONorOFF(pieceEnable[2]), (engine.statc[2] == 31));
- receiver.drawMenuFont(engine, playerID, 2, 12, "PIECE Z:" +
GeneralUtil.getONorOFF(pieceEnable[3]), (engine.statc[2] == 32));
- receiver.drawMenuFont(engine, playerID, 2, 13, "PIECE T:" +
GeneralUtil.getONorOFF(pieceEnable[4]), (engine.statc[2] == 33));
- receiver.drawMenuFont(engine, playerID, 2, 14, "PIECE J:" +
GeneralUtil.getONorOFF(pieceEnable[5]), (engine.statc[2] == 34));
- receiver.drawMenuFont(engine, playerID, 2, 15, "PIECE S:" +
GeneralUtil.getONorOFF(pieceEnable[6]), (engine.statc[2] == 35));
- receiver.drawMenuFont(engine, playerID, 2, 16, "PIECE I1:" +
GeneralUtil.getONorOFF(pieceEnable[7]), (engine.statc[2] == 36));
- receiver.drawMenuFont(engine, playerID, 2, 17, "PIECE I2:" +
GeneralUtil.getONorOFF(pieceEnable[8]), (engine.statc[2] == 37));
- receiver.drawMenuFont(engine, playerID, 2, 18, "PIECE I3:" +
GeneralUtil.getONorOFF(pieceEnable[9]), (engine.statc[2] == 38));
- receiver.drawMenuFont(engine, playerID, 2, 19, "PIECE L3:" +
GeneralUtil.getONorOFF(pieceEnable[10]), (engine.statc[2] == 39));
- receiver.drawMenuFont(engine, playerID, 2, 20, "USE MAP:" +
GeneralUtil.getONorOFF(useMap), (engine.statc[2] == 40));
- receiver.drawMenuFont(engine, playerID, 2, 21, "[EDIT FIELD MAP]",
(engine.statc[2] == 41));
- receiver.drawMenuFont(engine, playerID, 2, 22, "[LOAD FIELD MAP]:" +
mapNumber, (engine.statc[2] == 42));
- receiver.drawMenuFont(engine, playerID, 2, 23, "[SAVE FIELD MAP]:" +
mapNumber, (engine.statc[2] == 43));
- receiver.drawMenuFont(engine, playerID, 2, 24, "[LOAD PRESET]:" +
presetNumber, (engine.statc[2] == 44));
- receiver.drawMenuFont(engine, playerID, 2, 25, "[SAVE PRESET]:" +
presetNumber, (engine.statc[2] == 45));
+ (menuCursor == 28));
+ receiver.drawMenuFont(engine, playerID, 2, 9, "PIECE I:" +
GeneralUtil.getONorOFF(pieceEnable[0]), (menuCursor == 29));
+ receiver.drawMenuFont(engine, playerID, 2, 10, "PIECE L:" +
GeneralUtil.getONorOFF(pieceEnable[1]), (menuCursor == 30));
+ receiver.drawMenuFont(engine, playerID, 2, 11, "PIECE O:" +
GeneralUtil.getONorOFF(pieceEnable[2]), (menuCursor == 31));
+ receiver.drawMenuFont(engine, playerID, 2, 12, "PIECE Z:" +
GeneralUtil.getONorOFF(pieceEnable[3]), (menuCursor == 32));
+ receiver.drawMenuFont(engine, playerID, 2, 13, "PIECE T:" +
GeneralUtil.getONorOFF(pieceEnable[4]), (menuCursor == 33));
+ receiver.drawMenuFont(engine, playerID, 2, 14, "PIECE J:" +
GeneralUtil.getONorOFF(pieceEnable[5]), (menuCursor == 34));
+ receiver.drawMenuFont(engine, playerID, 2, 15, "PIECE S:" +
GeneralUtil.getONorOFF(pieceEnable[6]), (menuCursor == 35));
+ receiver.drawMenuFont(engine, playerID, 2, 16, "PIECE I1:" +
GeneralUtil.getONorOFF(pieceEnable[7]), (menuCursor == 36));
+ receiver.drawMenuFont(engine, playerID, 2, 17, "PIECE I2:" +
GeneralUtil.getONorOFF(pieceEnable[8]), (menuCursor == 37));
+ receiver.drawMenuFont(engine, playerID, 2, 18, "PIECE I3:" +
GeneralUtil.getONorOFF(pieceEnable[9]), (menuCursor == 38));
+ receiver.drawMenuFont(engine, playerID, 2, 19, "PIECE L3:" +
GeneralUtil.getONorOFF(pieceEnable[10]), (menuCursor == 39));
+ receiver.drawMenuFont(engine, playerID, 2, 20, "USE MAP:" +
GeneralUtil.getONorOFF(useMap), (menuCursor == 40));
+ receiver.drawMenuFont(engine, playerID, 2, 21, "[EDIT FIELD MAP]",
(menuCursor == 41));
+ receiver.drawMenuFont(engine, playerID, 2, 22, "[LOAD FIELD MAP]:" +
mapNumber, (menuCursor == 42));
+ receiver.drawMenuFont(engine, playerID, 2, 23, "[SAVE FIELD MAP]:" +
mapNumber, (menuCursor == 43));
+ receiver.drawMenuFont(engine, playerID, 2, 24, "[LOAD PRESET]:" +
presetNumber, (menuCursor == 44));
+ receiver.drawMenuFont(engine, playerID, 2, 25, "[SAVE PRESET]:" +
presetNumber, (menuCursor == 45));
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java Mon Nov
26 08:57:10 2012
@@ -204,7 +204,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
if(gametype < 0) gametype = GAMETYPE_MAX - 1;
@@ -226,7 +226,7 @@
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -238,12 +238,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java Mon
Nov 26 08:57:10 2012
@@ -256,7 +256,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
if(gametype < 0) gametype = GAMETYPE_MAX - 1;
@@ -281,7 +281,7 @@
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -293,12 +293,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMasteryMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMasteryMode.java Mon
Nov 26 08:57:10 2012
@@ -215,16 +215,16 @@
if(engine.owner.replayMode == false) {
// Check for UP button, when pressed it will move cursor up.
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] == 1 && gametype == GAMETYPE_PRESSURE)
engine.statc[2]--;
- if(engine.statc[2] < 0) engine.statc[2] = 2;
+ menuCursor--;
+ if(menuCursor == 1 && gametype == GAMETYPE_PRESSURE) menuCursor--;
+ if(menuCursor < 0) menuCursor = 2;
receiver.playSE("cursor");
}
// Check for DOWN button, when pressed it will move cursor down.
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] == 1 && gametype == GAMETYPE_PRESSURE)
engine.statc[2]++;
- if(engine.statc[2] > 2) engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor == 1 && gametype == GAMETYPE_PRESSURE) menuCursor++;
+ if(menuCursor > 2) menuCursor = 0;
receiver.playSE("cursor");
}
@@ -236,7 +236,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
if(gametype < 0) gametype = GAMETYPE_MAX - 1;
@@ -256,7 +256,7 @@
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -268,12 +268,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
@@ -287,17 +287,17 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.owner.replayMode == false) {
- receiver.drawMenuFont(engine, playerID, 0, (engine.statc[2] * 2) +
1, "b", EventReceiver.COLOR_RED);
+ receiver.drawMenuFont(engine, playerID, 0, (menuCursor * 2) + 1, "b",
EventReceiver.COLOR_RED);
}
receiver.drawMenuFont(engine, playerID, 0, 0, "GAME TYPE",
EventReceiver.COLOR_BLUE);
- receiver.drawMenuFont(engine, playerID, 1, 1, GAMETYPE_NAME[gametype],
(engine.statc[2] == 0));
+ receiver.drawMenuFont(engine, playerID, 1, 1, GAMETYPE_NAME[gametype],
(menuCursor == 0));
if(gametype != GAMETYPE_PRESSURE){
receiver.drawMenuFont(engine, playerID, 0, 2, "LEVEL",
EventReceiver.COLOR_BLUE);
- receiver.drawMenuFont(engine, playerID, 1, 3, String.format("%02d",
startlevel), (engine.statc[2] == 1));
+ receiver.drawMenuFont(engine, playerID, 1, 3, String.format("%02d",
startlevel), (menuCursor == 1));
}
receiver.drawMenuFont(engine, playerID, 0, 4, "BIG",
EventReceiver.COLOR_BLUE);
- receiver.drawMenuFont(engine, playerID, 1, 5,
GeneralUtil.getONorOFF(big), (engine.statc[2] == 2));
+ receiver.drawMenuFont(engine, playerID, 1, 5,
GeneralUtil.getONorOFF(big), (menuCursor == 2));
}
/**
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java Sat Nov 10
00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SPFMode.java Mon Nov 26
08:57:10 2012
@@ -564,23 +564,23 @@
if((engine.owner.replayMode == false) && (engine.statc[4] == 0)) {
// Up
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_UP)) {
- engine.statc[2]--;
- if(engine.statc[2] < 0){
- engine.statc[2] = 19;
+ menuCursor--;
+ if(menuCursor < 0){
+ menuCursor = 19;
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
}
- else if (engine.statc[2] == 17)
+ else if (menuCursor == 17)
engine.field = null;
engine.playSE("cursor");
}
// Down
if(engine.ctrl.isMenuRepeatKey(Controller.BUTTON_DOWN)) {
- engine.statc[2]++;
- if(engine.statc[2] > 19) {
- engine.statc[2] = 0;
+ menuCursor++;
+ if(menuCursor > 19) {
+ menuCursor = 0;
engine.field = null;
}
- else if (engine.statc[2] == 18)
+ else if (menuCursor == 18)
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
engine.playSE("cursor");
}
@@ -597,7 +597,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -715,12 +715,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -737,35 +737,35 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 180)
+ if(menuTime >= 180)
engine.statc[4] = 1;
- else if(engine.statc[3] > 120)
- engine.statc[2] = 18;
- else if (engine.statc[3] == 120)
+ else if(menuTime > 120)
+ menuCursor = 18;
+ else if (menuTime == 120)
{
- engine.statc[2] = 18;
+ menuCursor = 18;
loadDropMapPreview(engine, playerID,
DROP_PATTERNS[dropSet[playerID]][dropMap[playerID]]);
}
- else if(engine.statc[3] >= 60)
- engine.statc[2] = 9;
+ else if(menuTime >= 60)
+ menuCursor = 9;
} else {
// 開始
if((owner.engine[0].statc[4] == 1) && (owner.engine[1].statc[4] == 1)
&& (playerID == 1)) {
@@ -789,7 +789,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
initMenu(EventReceiver.COLOR_ORANGE, 0);
drawMenu(engine, playerID, receiver,
"GRAVITY", String.valueOf(engine.speed.gravity),
@@ -804,7 +804,7 @@
"LOAD", String.valueOf(presetNumber[playerID]),
"SAVE", String.valueOf(presetNumber[playerID]));
receiver.drawMenuFont(engine, playerID, 0, 19, "PAGE 1/3",
EventReceiver.COLOR_YELLOW);
- } else if (engine.statc[2] < 18){
+ } else if (menuCursor < 18){
initMenu(EventReceiver.COLOR_PINK, 9);
drawMenu(engine, playerID, receiver, "BGM", String.valueOf(bgmno));
menuColor = EventReceiver.COLOR_CYAN;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java Mon
Nov 26 08:57:10 2012
@@ -297,7 +297,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 2;
@@ -320,13 +320,13 @@
}
// Check for F button, when pressed this will flip Leaderboard/Best
Section Time Records
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -340,12 +340,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java Mon Nov
26 08:57:10 2012
@@ -260,7 +260,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -347,10 +347,10 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 16) {
+ if(menuCursor == 16) {
// Load preset
loadPreset(engine, owner.modeConfig, presetNumber);
@@ -358,7 +358,7 @@
if(netIsNetPlay && (netNumSpectators > 0)) {
netSendOptions(engine);
}
- } else if(engine.statc[2] == 17) {
+ } else if(menuCursor == 17) {
// Save preset
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
@@ -386,17 +386,17 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 10;
+ if(menuTime >= 60) {
+ menuCursor = 10;
}
- if(engine.statc[3] >= 120) {
+ if(menuTime >= 120) {
return false;
}
}
@@ -412,7 +412,7 @@
if(netIsNetRankingDisplayMode) {
// NET: Netplay Ranking
netOnRenderNetPlayRanking(engine, playerID, receiver);
- } else if(engine.statc[2] < 10) {
+ } else if(menuCursor < 10) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java Sat
Nov 10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java Mon
Nov 26 08:57:10 2012
@@ -416,7 +416,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
startlevel += change;
if(startlevel < 0) startlevel = 13;
@@ -444,13 +444,13 @@
}
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig, engine.ruleopt.strRuleName);
receiver.saveModeConfig(owner.modeConfig);
@@ -465,12 +465,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java Sat Nov
10 01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java Mon Nov
26 08:57:10 2012
@@ -31,6 +31,10 @@
import mu.nu.nullpo.game.component.Controller;
import mu.nu.nullpo.game.event.EventReceiver;
import mu.nu.nullpo.game.play.GameEngine;
+import mu.nu.nullpo.game.subsystem.mode.menu.BooleanMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.IntegerMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.OnOffMenuItem;
+import mu.nu.nullpo.game.subsystem.mode.menu.TimeMenuItem;
import mu.nu.nullpo.util.CustomProperties;
import mu.nu.nullpo.util.GeneralUtil;
@@ -161,19 +165,19 @@
private boolean isShowBestSectionTime;
/** Level at start */
- private int startlevel;
+ private IntegerMenuItem startlevel;
/** When true, levelstop sound is enabled */
- private boolean lvstopse;
+ private BooleanMenuItem lvstopse;
/** BigMode */
- private boolean big;
+ private BooleanMenuItem big;
/** LV500の足切りTime */
- private int lv500torikan;
+ private TimeMenuItem lv500torikan;
/** When true, section time display is enabled */
- private boolean showsectiontime;
+ private BooleanMenuItem showsectiontime;
/** Version */
private int version;
@@ -193,6 +197,28 @@
/** Section Time記録 */
private int[] bestSectionTime;
+ public SpeedManiaMode() {
+ propName = "speedmania";
+
+ startlevel = new IntegerMenuItem("startlevel", "LEVEL",
EventReceiver.COLOR_BLUE, 0, 0, 9) {
+ public String getValueString() {
+ return String.valueOf(value * 100);
+ }
+ };
+ lvstopse = new OnOffMenuItem("lvstopse", "LVSTOPSE",
EventReceiver.COLOR_BLUE, false);
+ big = new OnOffMenuItem("big", "BIG", EventReceiver.COLOR_BLUE, false);
+ showsectiontime = new OnOffMenuItem("big", "BIG",
EventReceiver.COLOR_BLUE, true);
+ lv500torikan = new TimeMenuItem("lv500torikan", "LV500LIMIT",
EventReceiver.COLOR_BLUE, 12300, 0, 72000) {
+ public String getValueString() {
+ return (value == 0) ? "NONE" : GeneralUtil.getTime(value);
+ }
+ };
+ menu.add(startlevel);
+ menu.add(lvstopse);
+ menu.add(showsectiontime);
+ menu.add(big);
+ menu.add(lv500torikan);
+ }
/*
* Mode name
*/
@@ -234,10 +260,6 @@
recoveryFlag = false;
rotateCount = 0;
isShowBestSectionTime = false;
- startlevel = 0;
- lvstopse = false;
- big = false;
- lv500torikan = 12300;
rankingRank = -1;
rankingGrade = new int[RANKING_MAX];
@@ -266,31 +288,7 @@
version = owner.replayProp.getProperty("speedmania.version", 0);
}
- owner.backgroundStatus.bg = startlevel;
- }
-
- /**
- * Load settings from property file
- * @param prop Property file
- */
- protected void loadSetting(CustomProperties prop) {
- startlevel = prop.getProperty("speedmania.startlevel", 0);
- lvstopse = prop.getProperty("speedmania.lvstopse", false);
- showsectiontime = prop.getProperty("speedmania.showsectiontime", false);
- big = prop.getProperty("speedmania.big", false);
- lv500torikan = prop.getProperty("speedmania.lv500torikan", 12300);
- }
-
- /**
- * Save settings to property file
- * @param prop Property file
- */
- protected void saveSetting(CustomProperties prop) {
- prop.setProperty("speedmania.startlevel", startlevel);
- prop.setProperty("speedmania.lvstopse", lvstopse);
- prop.setProperty("speedmania.showsectiontime", showsectiontime);
- prop.setProperty("speedmania.big", big);
- prop.setProperty("speedmania.lv500torikan", lv500torikan);
+ owner.backgroundStatus.bg = startlevel.value;
}
/**
@@ -324,7 +322,7 @@
private void setAverageSectionTime() {
if(sectionscomp > 0) {
int temp = 0;
- for(int i = startlevel; i < startlevel + sectionscomp; i++) {
+ for(int i = startlevel.value; i < startlevel.value + sectionscomp; i++)
{
if((i >= 0) && (i < sectiontime.length)) temp += sectiontime[i];
}
sectionavgtime = temp / sectionscomp;
@@ -391,43 +389,16 @@
// Menu
if(engine.owner.replayMode == false) {
// Configuration changes
- int change = updateCursor(engine, 4);
-
- if(change != 0) {
- engine.playSE("change");
-
- switch(engine.statc[2]) {
- case 0:
- startlevel += change;
- if(startlevel < 0) startlevel = 9;
- if(startlevel > 9) startlevel = 0;
- owner.backgroundStatus.bg = startlevel;
- break;
- case 1:
- lvstopse = !lvstopse;
- break;
- case 2:
- showsectiontime = !showsectiontime;
- break;
- case 3:
- big = !big;
- break;
- case 4:
- lv500torikan += 60 * change;
- if(lv500torikan < 0) lv500torikan = 72000;
- if(lv500torikan > 72000) lv500torikan = 0;
- break;
- }
- }
+ updateMenu(engine);
// section time display切替
- if(engine.ctrl.isPush(Controller.BUTTON_F) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_F) && (menuTime >= 5)) {
engine.playSE("change");
isShowBestSectionTime = !isShowBestSectionTime;
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -441,38 +412,25 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
return true;
}
-
- /*
- * Render the settings screen
- */
- @Override
- public void renderSetting(GameEngine engine, int playerID) {
- drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
- "LEVEL", String.valueOf(startlevel * 100),
- "LVSTOPSE", GeneralUtil.getONorOFF(lvstopse),
- "SHOW STIME", GeneralUtil.getONorOFF(showsectiontime),
- "BIG", GeneralUtil.getONorOFF(big),
- "LV500LIMIT", (lv500torikan == 0) ? "NONE" :
GeneralUtil.getTime(lv500torikan));
- }
/*
* Called at game start
*/
@Override
public void startGame(GameEngine engine, int playerID) {
- engine.statistics.level = startlevel * 100;
+ engine.statistics.level = startlevel.value * 100;
nextseclv = engine.statistics.level + 100;
if(engine.statistics.level < 0) nextseclv = 100;
@@ -480,7 +438,7 @@
owner.backgroundStatus.bg = engine.statistics.level / 100;
- engine.big = big;
+ engine.big = big.value;
setSpeed(engine);
setStartBgmlv(engine);
@@ -495,7 +453,7 @@
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((owner.replayMode == false) && (startlevel == 0) && (big == false)
&& (engine.ai == null)) {
+ if((owner.replayMode == false) && (startlevel.value == 0) && (big.value
== false) && (engine.ai == null)) {
if(!isShowBestSectionTime) {
// Rankings
float scale = (receiver.getNextDisplayType() == 2) ? 0.5f : 1.0f;
@@ -586,7 +544,7 @@
if(medalCO >= 1) receiver.drawScoreFont(engine, playerID, 3, 22, "CO",
getMedalFontColor(medalCO));
// Section Time
- if((showsectiontime == true) && (sectiontime != null)) {
+ if((showsectiontime.value) && (sectiontime != null)) {
int x = (receiver.getNextDisplayType() == 2) ? 8 : 12;
int x2 = (receiver.getNextDisplayType() == 2) ? 9 : 12;
@@ -626,7 +584,7 @@
// Level up
if(engine.statistics.level < nextseclv - 1) {
engine.statistics.level++;
- if((engine.statistics.level == nextseclv - 1) && (lvstopse == true))
engine.playSE("levelstop");
+ if((engine.statistics.level == nextseclv - 1) && (lvstopse.value))
engine.playSE("levelstop");
}
levelUp(engine);
@@ -668,7 +626,7 @@
if((engine.ending == 0) && (engine.statc[0] >= engine.statc[1] - 1) &&
(!lvupflag)) {
if(engine.statistics.level < nextseclv - 1) {
engine.statistics.level++;
- if((engine.statistics.level == nextseclv - 1) && (lvstopse == true))
engine.playSE("levelstop");
+ if((engine.statistics.level == nextseclv - 1) && (lvstopse.value))
engine.playSE("levelstop");
}
levelUp(engine);
lvupflag = true;
@@ -735,7 +693,7 @@
// 4-line clearカウント
if(lines >= 4) {
// SK medal
- if(big == true) {
+ if(big.value) {
if((engine.statistics.totalFour == 1) || (engine.statistics.totalFour
== 2) || (engine.statistics.totalFour == 4)) {
engine.playSE("medal");
medalSK++;
@@ -759,7 +717,7 @@
}
// CO medal
- if(big == true) {
+ if(big.value) {
if((engine.combo >= 2) && (medalCO < 1)) {
engine.playSE("medal");
medalCO = 1;
@@ -808,7 +766,7 @@
// RO medal
roMedalCheck(engine);
- } else if((nextseclv == 500) && (engine.statistics.level >= 500) &&
(lv500torikan > 0) && (engine.statistics.time > lv500torikan)) {
+ } else if((nextseclv == 500) && (engine.statistics.level >= 500) &&
(lv500torikan.value > 0) && (engine.statistics.time > lv500torikan.value)) {
// level500とりカン
engine.playSE("endingstart");
engine.statistics.level = 500;
@@ -865,7 +823,7 @@
// Update level for next section
nextseclv += 100;
if(nextseclv > 999) nextseclv = 999;
- } else if((engine.statistics.level == nextseclv - 1) && (lvstopse ==
true)) {
+ } else if((engine.statistics.level == nextseclv - 1) &&
(lvstopse.value)) {
engine.playSE("levelstop");
}
@@ -1023,7 +981,7 @@
owner.replayProp.setProperty("speedmania.version", version);
// Update rankings
- if((owner.replayMode == false) && (startlevel == 0) && (big == false) &&
(engine.ai == null)) {
+ if((owner.replayMode == false) && (startlevel.value == 0) && (big.value
== false) && (engine.ai == null)) {
updateRanking(grade, engine.statistics.level, engine.statistics.time);
if(medalST == 3) updateBestSectionTime();
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Sat Nov 10
01:50:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Mon Nov 26
08:57:10 2012
@@ -187,7 +187,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
gametype += change;
if(gametype < 0) gametype = GAMETYPE_MAX - 1;
@@ -215,7 +215,7 @@
}
// A button (confirm)
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -227,12 +227,12 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java Mon Nov
26 08:57:10 2012
@@ -288,7 +288,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
goaltype += change;
if(goaltype < 0) goaltype = GAMETYPE_MAX - 1;
@@ -334,7 +334,7 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -355,14 +355,14 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java Sat Nov
10 01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java Mon Nov
26 08:57:10 2012
@@ -493,7 +493,7 @@
if(change != 0) {
receiver.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
goaltype += change;
if(goaltype < 0) goaltype = GAMETYPE_MAX - 1;
@@ -522,7 +522,7 @@
}
// Check for A button, when pressed this will begin the game
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
receiver.playSE("decide");
saveSetting(owner.modeConfig);
receiver.saveModeConfig(owner.modeConfig);
@@ -543,12 +543,12 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
} else {
- engine.statc[3]++;
- engine.statc[2] = -1;
+ menuTime++;
+ menuCursor = -1;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
return false;
}
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ToolVSMapEditMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ToolVSMapEditMode.java Mon
Nov 26 08:57:10 2012
@@ -176,7 +176,7 @@
if(change != 0) {
engine.playSE("change");
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
case 1:
case 2:
@@ -198,26 +198,26 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 0) {
+ if(menuCursor == 0) {
// EDIT
engine.enterFieldEdit();
- } else if(engine.statc[2] == 1) {
+ } else if(menuCursor == 1) {
// GRAY->?
grayToRandomColor(engine.field);
- } else if(engine.statc[2] == 2) {
+ } else if(menuCursor == 2) {
// CLEAR
engine.field.reset();
- } else if(engine.statc[2] == 3) {
+ } else if(menuCursor == 3) {
// SAVE
if((nowMapID >= 0) && (nowMapID < listFields.size())) {
listFields.get(nowMapID).copy(engine.field);
} else {
listFields.add(new Field(engine.field));
}
- } else if(engine.statc[2] == 4) {
+ } else if(menuCursor == 4) {
// LOAD
if((nowMapID >= 0) && (nowMapID < listFields.size())) {
engine.field.copy(listFields.get(nowMapID));
@@ -225,16 +225,16 @@
} else {
engine.field.reset();
}
- } else if(engine.statc[2] == 5) {
+ } else if(menuCursor == 5) {
// DELETE
if((nowMapID >= 0) && (nowMapID < listFields.size())) {
listFields.remove(nowMapID);
if(nowMapID >= listFields.size()) nowMapID = listFields.size();
}
- } else if(engine.statc[2] == 6) {
+ } else if(menuCursor == 6) {
// WRITE
saveAllMaps(nowMapSetID);
- } else if(engine.statc[2] == 7) {
+ } else if(menuCursor == 7) {
// READ
loadAllMaps(nowMapSetID);
nowMapID = 0;
@@ -243,11 +243,11 @@
}
// 終了
- if(engine.ctrl.isPress(Controller.BUTTON_D) &&
engine.ctrl.isPress(Controller.BUTTON_E) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPress(Controller.BUTTON_D) &&
engine.ctrl.isPress(Controller.BUTTON_E) && (menuTime >= 5)) {
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
return true;
}
@@ -257,33 +257,33 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
receiver.drawMenuFont(engine, playerID, 0, 1, "FIELD EDIT",
EventReceiver.COLOR_DARKBLUE);
- if((engine.statc[2] >= 0) && (engine.statc[2] <= 2)) {
- receiver.drawMenuFont(engine, playerID, 0, 2 + engine.statc[2], "b",
EventReceiver.COLOR_RED);
+ if((menuCursor >= 0) && (menuCursor <= 2)) {
+ receiver.drawMenuFont(engine, playerID, 0, 2 + menuCursor, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 1, 2, "[EDIT]", (engine.statc[2]
== 0));
- receiver.drawMenuFont(engine, playerID, 1, 3, "[GRAY->?]",
(engine.statc[2] == 1));
- receiver.drawMenuFont(engine, playerID, 1, 4, "[CLEAR]",
(engine.statc[2] == 2));
+ receiver.drawMenuFont(engine, playerID, 1, 2, "[EDIT]", (menuCursor ==
0));
+ receiver.drawMenuFont(engine, playerID, 1, 3, "[GRAY->?]", (menuCursor
== 1));
+ receiver.drawMenuFont(engine, playerID, 1, 4, "[CLEAR]", (menuCursor ==
2));
receiver.drawMenuFont(engine, playerID, 0, 6, "MAP DATA",
EventReceiver.COLOR_DARKBLUE);
if(listFields.size() > 0) {
- receiver.drawMenuFont(engine, playerID, 0, 7, nowMapID + "/" +
(listFields.size() - 1), (engine.statc[2] >= 3) && (engine.statc[2] <= 5));
+ receiver.drawMenuFont(engine, playerID, 0, 7, nowMapID + "/" +
(listFields.size() - 1), (menuCursor >= 3) && (menuCursor <= 5));
} else {
- receiver.drawMenuFont(engine, playerID, 0, 7, "NO MAPS",
(engine.statc[2] >= 3) && (engine.statc[2] <= 5));
+ receiver.drawMenuFont(engine, playerID, 0, 7, "NO MAPS", (menuCursor >=
3) && (menuCursor <= 5));
}
- if((engine.statc[2] >= 3) && (engine.statc[2] <= 5)) {
- receiver.drawMenuFont(engine, playerID, 0, 8 + engine.statc[2] -
3, "b", EventReceiver.COLOR_RED);
+ if((menuCursor >= 3) && (menuCursor <= 5)) {
+ receiver.drawMenuFont(engine, playerID, 0, 8 + menuCursor - 3, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 1, 8, "[SAVE]", (engine.statc[2]
== 3));
- receiver.drawMenuFont(engine, playerID, 1, 9, "[LOAD]", (engine.statc[2]
== 4));
- receiver.drawMenuFont(engine, playerID, 1, 10, "[DELETE]",
(engine.statc[2] == 5));
+ receiver.drawMenuFont(engine, playerID, 1, 8, "[SAVE]", (menuCursor ==
3));
+ receiver.drawMenuFont(engine, playerID, 1, 9, "[LOAD]", (menuCursor ==
4));
+ receiver.drawMenuFont(engine, playerID, 1, 10, "[DELETE]", (menuCursor
== 5));
receiver.drawMenuFont(engine, playerID, 0, 12, "MAP FILE",
EventReceiver.COLOR_DARKBLUE);
- receiver.drawMenuFont(engine, playerID, 0, 13, nowMapSetID + "/99",
(engine.statc[2] >= 6) && (engine.statc[2] <= 7));
- if((engine.statc[2] >= 6) && (engine.statc[2] <= 7)) {
- receiver.drawMenuFont(engine, playerID, 0, 14 + engine.statc[2] -
6, "b", EventReceiver.COLOR_RED);
+ receiver.drawMenuFont(engine, playerID, 0, 13, nowMapSetID + "/99",
(menuCursor >= 6) && (menuCursor <= 7));
+ if((menuCursor >= 6) && (menuCursor <= 7)) {
+ receiver.drawMenuFont(engine, playerID, 0, 14 + menuCursor - 6, "b",
EventReceiver.COLOR_RED);
}
- receiver.drawMenuFont(engine, playerID, 1, 14, "[WRITE]",
(engine.statc[2] == 6));
- receiver.drawMenuFont(engine, playerID, 1, 15, "[READ]",
(engine.statc[2] == 7));
+ receiver.drawMenuFont(engine, playerID, 1, 14, "[WRITE]", (menuCursor ==
6));
+ receiver.drawMenuFont(engine, playerID, 1, 15, "[READ]", (menuCursor ==
7));
receiver.drawMenuFont(engine, playerID, 0, 19, "EXIT-> D+E",
EventReceiver.COLOR_ORANGE);
}
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java Sat Nov 10
01:22:14 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java Mon Nov 26
08:57:10 2012
@@ -252,7 +252,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -337,15 +337,15 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 16) {
+ if(menuCursor == 16) {
loadPreset(engine, owner.modeConfig, presetNumber);
// NET: Signal options change
if(netIsNetPlay && (netNumSpectators > 0)) netSendOptions(engine);
- } else if(engine.statc[2] == 17) {
+ } else if(menuCursor == 17) {
savePreset(engine, owner.modeConfig, presetNumber);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -370,17 +370,17 @@
netEnterNetPlayRankingScreen(engine, playerID, goaltype);
}
- engine.statc[3]++;
+ menuTime++;
}
// Replay
else {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 10;
+ if(menuTime >= 60) {
+ menuCursor = 10;
}
- if(engine.statc[3] >= 120) {
+ if(menuTime >= 120) {
return false;
}
}
@@ -396,7 +396,7 @@
if(netIsNetRankingDisplayMode) {
// NET: Netplay Ranking
netOnRenderNetPlayRanking(engine, playerID, receiver);
- } else if(engine.statc[2] < 10) {
+ } else if(menuCursor < 10) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_BLUE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSBattleMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSBattleMode.java Mon Nov
26 08:57:10 2012
@@ -482,7 +482,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -621,12 +621,12 @@
}
// 決定
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -643,28 +643,28 @@
}
// プレビュー用Map読み込み
- if(useMap[playerID] && (engine.statc[3] == 0)) {
+ if(useMap[playerID] && (menuTime == 0)) {
loadMapPreview(engine, playerID, (mapNumber[playerID] < 0) ? 0 :
mapNumber[playerID], true);
}
// Random map preview
if(useMap[playerID] && (propMap[playerID] != null) &&
(mapNumber[playerID] < 0)) {
- if(engine.statc[3] % 30 == 0) {
+ if(menuTime % 30 == 0) {
engine.statc[5]++;
if(engine.statc[5] >= mapMaxNo[playerID]) engine.statc[5] = 0;
loadMapPreview(engine, playerID, engine.statc[5], false);
}
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 9;
+ if(menuTime >= 60) {
+ menuCursor = 9;
}
- if(engine.statc[3] >= 120) {
+ if(menuTime >= 120) {
engine.statc[4] = 1;
}
} else {
@@ -690,7 +690,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
@@ -702,7 +702,7 @@
drawMenu(engine, playerID, receiver, 14, EventReceiver.COLOR_GREEN, 7,
"LOAD", String.valueOf(presetNumber[playerID]),
"SAVE", String.valueOf(presetNumber[playerID]));
- } else if(engine.statc[2] < 19) {
+ } else if(menuCursor < 19) {
String strTSpinEnable = "";
if(version >= 4) {
if(tspinEnableType[playerID] == 0) strTSpinEnable = "OFF";
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSDigRaceMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSDigRaceMode.java Mon Nov
26 08:57:10 2012
@@ -187,7 +187,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -251,12 +251,12 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -272,16 +272,16 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
// Replay start
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
- engine.statc[2] = 9;
+ if(menuTime >= 60) {
+ menuCursor = 9;
}
- if(engine.statc[3] >= 120) {
+ if(menuTime >= 120) {
engine.statc[4] = 1;
}
} else {
@@ -307,7 +307,7 @@
@Override
public void renderSetting(GameEngine engine, int playerID) {
if(engine.statc[4] == 0) {
- if(engine.statc[2] < 9) {
+ if(menuCursor < 9) {
drawMenu(engine, playerID, receiver, 0, EventReceiver.COLOR_ORANGE, 0,
"GRAVITY", String.valueOf(engine.speed.gravity),
"G-MAX", String.valueOf(engine.speed.denominator),
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSLineRaceMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/VSLineRaceMode.java Mon Nov
26 08:57:10 2012
@@ -186,7 +186,7 @@
if(engine.ctrl.isPress(Controller.BUTTON_E)) m = 100;
if(engine.ctrl.isPress(Controller.BUTTON_F)) m = 1000;
- switch(engine.statc[2]) {
+ switch(menuCursor) {
case 0:
engine.speed.gravity += change * m;
if(engine.speed.gravity < -1) engine.speed.gravity = 99999;
@@ -248,12 +248,12 @@
}
// Confirm
- if(engine.ctrl.isPush(Controller.BUTTON_A) && (engine.statc[3] >= 5)) {
+ if(engine.ctrl.isPush(Controller.BUTTON_A) && (menuTime >= 5)) {
engine.playSE("decide");
- if(engine.statc[2] == 7) {
+ if(menuCursor == 7) {
loadPreset(engine, owner.modeConfig, presetNumber[playerID]);
- } else if(engine.statc[2] == 8) {
+ } else if(menuCursor == 8) {
savePreset(engine, owner.modeConfig, presetNumber[playerID]);
receiver.saveModeConfig(owner.modeConfig);
} else {
@@ -269,13 +269,13 @@
engine.quitflag = true;
}
- engine.statc[3]++;
+ menuTime++;
} else if(engine.statc[4] == 0) {
// Replay start
- engine.statc[3]++;
- engine.statc[2] = 0;
+ menuTime++;
+ menuCursor = 0;
- if(engine.statc[3] >= 60) {
+ if(menuTime >= 60) {
engine.statc[4] = 1;
}
} else {
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/menu/AbstractMenuItem.java
Sat Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/menu/AbstractMenuItem.java
Mon Nov 26 08:57:10 2012
@@ -21,10 +21,11 @@
public abstract String getValueString();
/**
- * Change the attribute
- *
+ * Change the attribute.
+ *
* @param dir
- * Direction pressed: -1 = left, 1 = right
+ * Direction pressed: -1 = left, 1 = right.
+ * If 0, update without changing any settings.
* @param fast
* 0 by default, +1 if E held, +2 if F held.
*/
Reply all
Reply to author
Forward
0 new messages