Minor fixes
This commit is contained in:
@ -12,19 +12,19 @@ public class LevelManager {
|
||||
@Getter
|
||||
public enum Level {
|
||||
LEVEL1(1,6000, 0.75, 0.8, FruitType.CHERRY),
|
||||
LEVEL2(2,3000, 0.85, 0.85, FruitType.CHERRY),
|
||||
LEVEL3(3,1000, 0.95, 0.9, FruitType.CHERRY),
|
||||
LEVEL4(4,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL5(5,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL6(6,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL7(7,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL8(8,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL9(9,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL10(10,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL11(11,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL12(12,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL13(13,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL14(14,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL2(2, 6000, 0.75, 0.8, FruitType.CHERRY),
|
||||
LEVEL3(3, 6000, 0.75, 0.8, FruitType.CHERRY),
|
||||
LEVEL4(4, 6000, 0.75, 0.8, FruitType.CHERRY),
|
||||
LEVEL5(5, 3000, 0.85, 0.85, FruitType.CHERRY),
|
||||
LEVEL6(6, 3000, 0.85, 0.85, FruitType.CHERRY),
|
||||
LEVEL7(7, 3000, 0.85, 0.85, FruitType.CHERRY),
|
||||
LEVEL8(8, 3000, 0.85, 0.85, FruitType.CHERRY),
|
||||
LEVEL9(9, 3000, 0.85, 0.85, FruitType.CHERRY),
|
||||
LEVEL10(10, 1000, 0.95, 0.9, FruitType.CHERRY),
|
||||
LEVEL11(11, 1000, 0.95, 0.9, FruitType.CHERRY),
|
||||
LEVEL12(12, 1000, 0.95, 0.9, FruitType.CHERRY),
|
||||
LEVEL13(13, 1000, 0.95, 0.9, FruitType.CHERRY),
|
||||
LEVEL14(14, 6000, 0.95, 0.9, FruitType.CHERRY),
|
||||
LEVEL15(15,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL16(16,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
LEVEL17(17,6000, 0.75, 0.85, FruitType.CHERRY),
|
||||
|
||||
@ -3,9 +3,13 @@ package se.urmo.game.map;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import se.urmo.game.util.Direction;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Point;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.*;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
@ -20,7 +24,7 @@ public class GameMap {
|
||||
public static final int OFFSET_X = MAP_TILESIZE; // 16px from left
|
||||
private MapTile[][] mapData;
|
||||
private final int[][] csvData;
|
||||
private long numberOfDots;
|
||||
private final long numberOfDots;
|
||||
|
||||
|
||||
public GameMap(String mapFilePath) {
|
||||
@ -67,11 +71,6 @@ public class GameMap {
|
||||
.map(String::trim)
|
||||
.mapToInt(Integer::parseInt)
|
||||
.toArray();
|
||||
|
||||
// for (int col = 0; col < mapColSize; col++) {
|
||||
// int value = Integer.parseInt(tokens[col].trim());
|
||||
// data[row][col] = MapTile.byType(TileType.fromValue(value));
|
||||
// }
|
||||
}
|
||||
|
||||
if (row != mapRowSize) {
|
||||
@ -252,8 +251,8 @@ public class GameMap {
|
||||
}
|
||||
|
||||
public long numberOfDots() {
|
||||
//return this.numberOfDots;
|
||||
return 50;
|
||||
return this.numberOfDots;
|
||||
//return 50;
|
||||
}
|
||||
|
||||
public void reset() {
|
||||
|
||||
Reference in New Issue
Block a user