New tilesets!

treytomes · Dec 19, 2023 · 6605067 · 6605067
1 parent d7f6d94
commit 6605067
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 14 deletions.
diff --git a/assets/OEM437_12_ex.pdn b/assets/OEM437_12_ex.pdn
diff --git a/assets/OEM437_16_ex.pdn b/assets/OEM437_16_ex.pdn
diff --git a/assets/OEM437_16_ex.png b/assets/OEM437_16_ex.png
diff --git a/assets/OEM437_24_ex.pdn b/assets/OEM437_24_ex.pdn
diff --git a/assets/OEM437_24_ex.png b/assets/OEM437_24_ex.png
diff --git a/assets/micro-font-12.pdn b/assets/micro-font-12.pdn
diff --git a/src/MapDisplay.ms b/src/MapDisplay.ms
@@ -3,8 +3,8 @@ MapDisplay = {}
 MapDisplay.initTiles = function(displayNumber)
  dsp = new TileDisplay // Create a detached TileDisplay.
  // display(displayNumber).mode = displayMode.tile
- dsp.tileSet = file.loadImage("assets/OEM437_8.png")
- dsp.tileSetTileSize = 8
+ dsp.tileSet = file.loadImage("assets/OEM437_16_ex.png")
+ dsp.tileSetTileSize = 16
  dsp.cellSize = 16
  dsp.extent = [constants.TILE_DISPLAY_WIDTH, constants.TILE_DISPLAY_HEIGHT]
  return dsp
@@ -66,9 +66,6 @@ MapDisplay.setCell = function(x, y, tile, color="#FFFFFF", backColor = "#0000000
  if tile isa string then
  tile = code(tile)
  end if
- if tile > 255 then
- tile = code("?")
- end if
 
  if color isa Color then
  color = color.str()

diff --git a/src/factories/entities.ms b/src/factories/entities.ms
@@ -2,7 +2,7 @@
 
 makePlayer = function()
  // t = tile.make(char(57872), Color.white, Color.black, true, false) // TODO
- t = tile.make(char(2), Color.white, Color.black, true, false)
+ t = tile.make(255+16-3, Color.white, Color.black, true, false)
  e = (new entity.Entity).init(t, races.human, classes.fighter)
 
  e.name = "player" //e.race.name

diff --git a/src/tile.ms b/src/tile.ms
@@ -29,10 +29,6 @@ Tile.draw = function(dsp, x, y)
  if fg isa Color then fg = fg.str
  bg = self.backgroundColor
  if bg isa Color then bg = bg.str
-
- // tileDisplay.setCellColor x, y, fg
- // tileDisplay.setCellBackColor x, y, bg
- // tileDisplay.setCell x, y, self.char
  dsp.setCell x, y, self.char, fg, bg
 end function
 
@@ -41,10 +37,6 @@ Tile.drawDim = function(dsp, x, y)
  if fg isa Color then fg = fg.darker.str else fg = "#444444"
  bg = self.backgroundColor
  if bg isa Color then bg = bg.darker.str else bg = color.black
-
- // tileDisplay.setCellColor x, y, fg
- // tileDisplay.setCellBackColor x, y, bg
- // tileDisplay.setCell x, y, self.char
  dsp.setCell x, y, self.char, fg, bg
 end function