From 4a5c8508ff75c1e8ec503937ad97505e250bb94b Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Thu, 2 Jun 2022 20:00:30 +0000 Subject: [PATCH] Display View and Type value per screen. Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com> Co-authored-by: sigonasr2 --- bin/RabiClone.jar | Bin 34256 -> 34407 bytes src/sig/map/Maps.java | 18 ++++++++++++++++++ src/sig/map/Tile.java | 4 ++++ src/sig/map/Type.java | 9 +++++++++ src/sig/objects/EditorRenderer.java | 2 ++ 5 files changed, 33 insertions(+) create mode 100644 src/sig/map/Type.java diff --git a/bin/RabiClone.jar b/bin/RabiClone.jar index 8962d3f278b72108ed05b8342da830878de4dd7b..24ee248e96bf1c6618ee2f8be6d3c439d938c93b 100644 GIT binary patch delta 6589 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 delta 6500 zcmZ9QbyQT{`}Sv$5r&QdDT$FzK|(qNh7ReFloC+7Vd(B5C8VX47#cykJ0zu)9y(Rx zCw!mvuIG8rANzCm-q(Haz0O(doa^43(P(2)XgF$$56~e1OiWBbeO3aFFxuZ%KKriS zrv2L@v4N79e~C~5Gu^>YgA^G920i%a9uWh^MbP?VAX{-b(Ec@sB*1sO?;CPHMivqR zN$%#jxgR5T{Be-uj85oxeHpfiJKRb5+3D}(NJGxadvbGI-mhA!_!wCyxOKN2GDpadupyS?c_ zWz)R=5xhmy+W91)2P9meJo(8Ksuf7AWDW*zQGJ+-rO!!;>agNRMC`l0DU8hR7jOyq zOQuP;Ps6!u43l}ETh8^Df1evIFWKE*?$$2@zr?&lk#)OJE_HjmeF-3^wDkPaX*tqV z3HW8xDY8^=3J=H!X0uo8RX+(=qtve)ifFd$$PBN%0D7}2(U=g|PEwSihO6p(mYTBO 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 NqM`H;7kuwR{|`vhGP3{x diff --git a/src/sig/map/Maps.java b/src/sig/map/Maps.java index bb52597..5a67438 100644 --- a/src/sig/map/Maps.java +++ b/src/sig/map/Maps.java @@ -37,4 +37,22 @@ public enum Maps { return Tile.values()[this.map.tiles[index]]; } } + + public View getView(int x,int y) { + int index = (y/Tile.TILE_SCREEN_COUNT_Y)*(Map.MAP_WIDTH/Tile.TILE_WIDTH)+x/Tile.TILE_SCREEN_COUNT_X; + if (index<0||index>=this.map.views.length) { + return View.DIRECT_FOLLOW; + } else { + return View.values()[this.map.views[index]]; + } + } + + public Type getType(int x,int y) { + int index = (y/Tile.TILE_SCREEN_COUNT_Y)*(Map.MAP_WIDTH/Tile.TILE_WIDTH)+x/Tile.TILE_SCREEN_COUNT_X; + if (index<0||index>=this.map.types.length) { + return Type.NONE; + } else { + return Type.values()[this.map.types[index]]; + } + } } diff --git a/src/sig/map/Tile.java b/src/sig/map/Tile.java index f4ca9fc..08ad072 100644 --- a/src/sig/map/Tile.java +++ b/src/sig/map/Tile.java @@ -1,5 +1,7 @@ package sig.map; +import sig.RabiClone; + public enum Tile { VOID(0,0,true,CollisionType.NONE), //File is populated by 0s by default. This represents the void. WALL(0,0,CollisionType.BLOCK), @@ -11,6 +13,8 @@ public enum Tile { final public static int TILE_WIDTH=32; final public static int TILE_HEIGHT=32; + final public static int TILE_SCREEN_COUNT_X=RabiClone.BASE_WIDTH/TILE_WIDTH; + final public static int TILE_SCREEN_COUNT_Y=RabiClone.BASE_HEIGHT/TILE_HEIGHT; int spriteSheetX,spriteSheetY; boolean invisible; diff --git a/src/sig/map/Type.java b/src/sig/map/Type.java new file mode 100644 index 0000000..ed5bd88 --- /dev/null +++ b/src/sig/map/Type.java @@ -0,0 +1,9 @@ +package sig.map; + +public enum Type { + NONE, + POI, + SAVE, + WARP, + SPECIAL_ITEM; +} diff --git a/src/sig/objects/EditorRenderer.java b/src/sig/objects/EditorRenderer.java index 95a8113..89edd96 100644 --- a/src/sig/objects/EditorRenderer.java +++ b/src/sig/objects/EditorRenderer.java @@ -114,6 +114,8 @@ public class EditorRenderer extends LevelRenderer{ double tileY = y*Tile.TILE_HEIGHT-this.getY(); DrawTransparentTile(tileX,tileY,selectedTile,Alpha.ALPHA160); Draw_Text(tileX+2,tileY-Font.PROFONT_12.getGlyphHeight()-2,new StringBuilder(selectedTile.toString()),Font.PROFONT_12); + Draw_Text(tileX+2,tileY+2,new StringBuilder("View: ").append(PaletteColor.EMERALD).append(RabiClone.CURRENT_MAP.getView(x,y).ordinal()),Font.PROFONT_12); + Draw_Text(tileX+2,tileY+Font.PROFONT_12.getGlyphHeight()+2,new StringBuilder("Type: ").append(PaletteColor.MIDNIGHT_BLUE).append(RabiClone.CURRENT_MAP.getType(x,y).ordinal()),Font.PROFONT_12); Draw_Text_Ext(tileX+2,tileY+Tile.TILE_HEIGHT+2,new StringBuilder(RabiClone.CURRENT_MAP.getTile(x,y).toString()),Font.PROFONT_12,Alpha.ALPHA0,PaletteColor.CRIMSON); } }