diff --git a/bin/RabiClone.jar b/bin/RabiClone.jar index 6434a56..6c8ce04 100644 Binary files a/bin/RabiClone.jar and b/bin/RabiClone.jar differ diff --git a/mulfok32-1x.png palette.gpl b/mulfok32-1x.png palette.gpl new file mode 100644 index 0000000..3e42a9c --- /dev/null +++ b/mulfok32-1x.png palette.gpl @@ -0,0 +1,38 @@ +GIMP Palette +Name: mulfok32-1x.png palette +Columns: 0 +# + 91 166 117 Untitled +107 201 108 Untitled +171 221 100 Untitled +252 239 141 Untitled +255 184 121 Untitled +234 98 98 Untitled +204 66 94 Untitled +163 40 88 Untitled +117 23 86 Untitled + 57 9 71 Untitled + 97 24 81 Untitled +135 53 85 Untitled +166 85 95 Untitled +201 115 115 Untitled +242 174 153 Untitled +255 195 242 Untitled +238 143 203 Untitled +212 110 179 Untitled +135 62 132 Untitled + 31 16 42 Untitled + 74 48 82 Untitled +123 84 128 Untitled +166 133 159 Untitled +217 189 200 Untitled +255 255 255 Untitled +174 226 255 Untitled +141 183 255 Untitled +109 128 250 Untitled +132 101 236 Untitled +131 77 196 Untitled +125 45 160 Untitled + 78 24 124 Untitled +255 0 255 Untitled + diff --git a/sprites/maptileinfo.gif b/sprites/maptileinfo.gif new file mode 100644 index 0000000..3d77e92 Binary files /dev/null and b/sprites/maptileinfo.gif differ diff --git a/src/sig/engine/Sprite.java b/src/sig/engine/Sprite.java index 98576b7..57883f5 100644 --- a/src/sig/engine/Sprite.java +++ b/src/sig/engine/Sprite.java @@ -3,6 +3,7 @@ package sig.engine; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.util.Arrays; import java.awt.image.DataBufferByte; import javax.imageio.ImageIO; @@ -12,6 +13,7 @@ public enum Sprite{ NANA(new File(new File("..","sprites"),"3x.png")), NANA_SMALL(new File(new File("..","sprites"),"1x.gif")), TILE_SHEET(new File(new File("..","sprites"),"tiles.gif")), + MAP_TILE_INFO(new File(new File("..","sprites"),"maptileinfo.gif")), ; @@ -27,6 +29,9 @@ public enum Sprite{ this.width=img.getWidth(); this.height=img.getHeight(); bi_array = ((DataBufferByte)(img.getRaster().getDataBuffer())).getData(); + if (this.ordinal()==3) { + System.out.println(Arrays.toString(bi_array)); + } } catch (IOException e) { e.printStackTrace(); } diff --git a/src/sig/objects/EditorRenderer.java b/src/sig/objects/EditorRenderer.java index 46b23cb..7de6205 100644 --- a/src/sig/objects/EditorRenderer.java +++ b/src/sig/objects/EditorRenderer.java @@ -6,6 +6,7 @@ import java.awt.event.MouseEvent; import sig.RabiClone; import sig.engine.MouseScrollValue; import sig.engine.Panel; +import sig.engine.Sprite; import sig.map.Map; import sig.map.Tile; @@ -56,5 +57,6 @@ public class EditorRenderer extends LevelRenderer{ @Override public void draw(byte[] p) { super.draw(p); + Draw_Sprite(16, 16, Sprite.MAP_TILE_INFO); } }