diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class index b26b822e7..dd675bac6 100644 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class and b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class index 6c742aa3d..61b4276a1 100644 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class and b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class index ab953514d..6be81442b 100644 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class and b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class index 6421f3f38..fe2c907ff 100644 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class and b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class index f24b867dc..a6f7bdfa8 100644 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class and b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class index af025a93b..fb1caa180 100644 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class and b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class differ diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class index 4ebc44c3d..dba1b230d 100644 Binary files a/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class and b/out/production/Terrarum_renewed/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.class differ diff --git a/src/com/Torvald/Terrarum/GameMap/GameMap.java b/src/com/Torvald/Terrarum/GameMap/GameMap.java index 4c4103d06..df40988b5 100644 --- a/src/com/Torvald/Terrarum/GameMap/GameMap.java +++ b/src/com/Torvald/Terrarum/GameMap/GameMap.java @@ -42,6 +42,8 @@ public class GameMap { private char globalLight; private WorldTime worldTime; + public static final int TILES_SUPPORTED = MapLayer.RANGE * PairedMapLayer.RANGE; + /** * @param width * @param height diff --git a/src/com/Torvald/Terrarum/GameMap/MapLayer.java b/src/com/Torvald/Terrarum/GameMap/MapLayer.java index 2e0b03b4d..039c0e297 100644 --- a/src/com/Torvald/Terrarum/GameMap/MapLayer.java +++ b/src/com/Torvald/Terrarum/GameMap/MapLayer.java @@ -14,7 +14,7 @@ public class MapLayer implements Iterable { public int width; public int height; - public static final int TILES_SUPPORTED = 256; + public static final int RANGE = 256; public MapLayer(int width, int height) { this.width = width; diff --git a/src/com/Torvald/Terrarum/MapDrawer/MapCamera.java b/src/com/Torvald/Terrarum/MapDrawer/MapCamera.java index 3de6ac7df..582a3336d 100644 --- a/src/com/Torvald/Terrarum/MapDrawer/MapCamera.java +++ b/src/com/Torvald/Terrarum/MapDrawer/MapCamera.java @@ -64,7 +64,12 @@ public class MapCamera { , TileNameCode.DIRT , TileNameCode.GRASS , TileNameCode.SAND + , TileNameCode.SAND_BEACH + , TileNameCode.SAND_RED + , TileNameCode.SAND_DESERT + , TileNameCode.SAND_BLACK , TileNameCode.GRAVEL + , TileNameCode.GRAVEL_GREY , TileNameCode.SNOW , TileNameCode.ICE_NATURAL , TileNameCode.WATER @@ -211,7 +216,7 @@ public class MapCamera { int thisTileY = thisTile / PairedMapLayer.RANGE; if (drawModeTilesBlendMul) { - if (isBlendMul((byte) thisTile)) { + if (isBlendMul(thisTile)) { drawTile(mode, x, y, thisTileX, thisTileY); } } @@ -414,15 +419,15 @@ public class MapCamera { } private static boolean isConnectSelf(int b) { - return (Arrays.asList(TILES_CONNECT_SELF).contains((byte) b)); + return Arrays.asList(TILES_CONNECT_SELF).contains(b); } private static boolean isDarkenAir(int b) { - return (Arrays.asList(TILES_DARKEN_AIR).contains((byte) b)); + return Arrays.asList(TILES_DARKEN_AIR).contains(b); } private static boolean isBlendMul(int b) { - return (Arrays.asList(TILES_BLEND_MUL).contains((byte) b)); + return Arrays.asList(TILES_BLEND_MUL).contains(b); } private static void setBlendModeMul() { diff --git a/src/com/Torvald/Terrarum/TileProperties/TileNameCode.java b/src/com/Torvald/Terrarum/TileProperties/TileNameCode.java index cdedb98d6..e07b1eaab 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TileNameCode.java +++ b/src/com/Torvald/Terrarum/TileProperties/TileNameCode.java @@ -29,7 +29,9 @@ public class TileNameCode { public static final int SAND_RED = TilePropCodex.indexDamageToArrayAddr(5, 2); public static final int SAND_DESERT = TilePropCodex.indexDamageToArrayAddr(5, 3); public static final int SAND_BLACK = TilePropCodex.indexDamageToArrayAddr(5, 4); + public static final int GRAVEL = TilePropCodex.indexDamageToArrayAddr(6, 0); + public static final int GRAVEL_GREY = TilePropCodex.indexDamageToArrayAddr(6, 1); public static final int ORE_COPPER = TilePropCodex.indexDamageToArrayAddr(7, 0); public static final int ORE_IRON = TilePropCodex.indexDamageToArrayAddr(7, 1); diff --git a/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.java b/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.java index 34d21a620..b2fe47d9a 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.java +++ b/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.java @@ -6,7 +6,6 @@ import com.Torvald.Terrarum.GameMap.PairedMapLayer; import org.apache.commons.csv.CSVRecord; import java.io.IOException; -import java.util.Hashtable; import java.util.List; /** @@ -17,7 +16,7 @@ public class TilePropCodex { private static TileProp[] tileProps; public TilePropCodex() { - tileProps = new TileProp[MapLayer.TILES_SUPPORTED * (PairedMapLayer.RANGE)]; + tileProps = new TileProp[MapLayer.RANGE * (PairedMapLayer.RANGE)]; for (int i = 0; i < tileProps.length; i++) { tileProps[i] = new TileProp(); diff --git a/src/com/Torvald/Terrarum/TileStat/TileStat.java b/src/com/Torvald/Terrarum/TileStat/TileStat.java index 3d2721556..7e2afb857 100644 --- a/src/com/Torvald/Terrarum/TileStat/TileStat.java +++ b/src/com/Torvald/Terrarum/TileStat/TileStat.java @@ -15,7 +15,7 @@ import java.util.Arrays; */ public class TileStat { - private static short[] tilestat = new short[MapLayer.TILES_SUPPORTED]; + private static short[] tilestat = new short[GameMap.TILES_SUPPORTED]; private static final int TSIZE = MapDrawer.TILE_SIZE; @@ -30,8 +30,6 @@ public class TileStat { GameMap map = Terrarum.game.map; Player player = Terrarum.game.getPlayer(); - float zoom = Terrarum.game.screenZoom; - int renderWidth = FastMath.ceil(Terrarum.WIDTH); int renderHeight = FastMath.ceil(Terrarum.HEIGHT); @@ -82,7 +80,7 @@ public class TileStat { * @return copy of the stat data */ public static short[] getStatCopy() { - return Arrays.copyOf(tilestat, MapLayer.TILES_SUPPORTED); + return Arrays.copyOf(tilestat, MapLayer.RANGE); } } diff --git a/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.java b/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.java index c9fd1e1d0..318abdc41 100644 --- a/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.java +++ b/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.java @@ -2,6 +2,7 @@ package com.Torvald.Terrarum.UserInterface; import com.Torvald.Terrarum.Actors.PlayerDebugger; import com.Torvald.Terrarum.Actors.Hitbox; +import com.Torvald.Terrarum.GameMap.PairedMapLayer; import com.Torvald.Terrarum.LangPack.Lang; import com.Torvald.Terrarum.MapDrawer.LightmapRenderer; import com.Torvald.Terrarum.MapDrawer.MapDrawer; @@ -92,10 +93,13 @@ public class BasicDebugInfoWindow implements UICanvas { String tileNo; try { - tileNo = String.valueOf(Terrarum.game.map.getTileFromTerrain(mouseTileX, mouseTileY)); + int tileNumRaw = Terrarum.game.map.getTileFromTerrain(mouseTileX, mouseTileY); + int tilenum = tileNumRaw / PairedMapLayer.RANGE; + int tiledmg = tileNumRaw % PairedMapLayer.RANGE; + tileNo = tilenum + ":" + tiledmg; } catch (ArrayIndexOutOfBoundsException e) { - tileNo = "out of bounds"; + tileNo = "-"; } printLine(g, 9, "tile : " + tileNo + " (" + mtX + ", " + mtY + ")");