diff --git a/src/Car.java b/src/Car.java index 7093a91..c3ff178 100644 --- a/src/Car.java +++ b/src/Car.java @@ -13,6 +13,8 @@ public class Car { /** Nombre total de cases dans une boucle (doit ĂȘtre > 0) */ private final int loop; + /** Nombre de fuel restant */ + private int fuel = 60; /** * Construit une nouvelle voiture. @@ -73,4 +75,15 @@ public class Car { { return loop; } + + public int getFuel() + { + return fuel; + } + + public Car consumeFuel() + { + fuel -= State.get().getConsumption(); + return this; + } } \ No newline at end of file diff --git a/src/State.java b/src/State.java index 890b920..315f069 100644 --- a/src/State.java +++ b/src/State.java @@ -1,19 +1,39 @@ public class State { - public static enum Status + public static enum DriveMode { - NORMAL; +// + NORMAL(2, 1, 6); + + private int carbUsed; + private int[] interval; + + private DriveMode(int carbUsed, int fInterval, int sInterval) + { + this.carbUsed = carbUsed; + interval = new int[] {fInterval, sInterval}; + } + + public int getConsumption() + { + return carbUsed; + } + + public int[] getInterval() + { + return interval; + } } - private static Status current = Status.NORMAL; + private static DriveMode current = DriveMode.NORMAL; - public static Status get() + public static DriveMode get() { return current; } - public static void set(Status status) + public static void set(DriveMode DriveMode) { - current = status; + current = DriveMode; } }