summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-02-18 11:20:50 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-02-18 11:20:50 +0100
commit25d9117d0d5e2223184d1c6bb1ed2f753218733b (patch)
tree71a40bd874d6f648acdb7987737eb71167c8e438 /core/src/ch/asynk/tankontank
parentdb5d4de939a6f4ce0581ed61c4e7a9c9f04648df (diff)
downloadRustAndDust-25d9117d0d5e2223184d1c6bb1ed2f753218733b.zip
RustAndDust-25d9117d0d5e2223184d1c6bb1ed2f753218733b.tar.gz
Map: die -> dice
Diffstat (limited to 'core/src/ch/asynk/tankontank')
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 695f256..3d16420 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -473,7 +473,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS
int d2 = d6();
int d3 = 0;
int d4 = 0;
- int die = d1 + d2;
+ int dice = d1 + d2;
int distance = 0;
boolean night = (meteorology.day == Meteorology.Day.NIGHT);
@@ -505,13 +505,13 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS
else if (distance > 1)
wdf = 1;
}
- int s1 = (die + cnt + flk);
+ int s1 = (dice + cnt + flk);
int s2 = (def + tdf + wdf);
boolean success = false;
- if (die == 2) {
+ if (dice == 2) {
success = false;
- } else if (die == 12) {
+ } else if (dice == 12) {
success = true;
} else {
success = (s1 >= s2);
@@ -519,12 +519,12 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS
if (!success && mayReroll) {
d3 = d6();
d4 = d6();
- die = d3 + d4;
+ dice = d3 + d4;
TankOnTank.debug(String.format("Reroll: (%d %d -> %d %d)", d1, d2, d3, d4));
- s1 = (die + cnt + flk);
- if (die == 2) {
+ s1 = (dice + cnt + flk);
+ if (dice == 2) {
success = false;
- } else if (die == 12) {
+ } else if (dice == 12) {
success = true;
} else {
success = (s1 >= s2);