Silly doge

This commit is contained in:
ceikry 2021-11-02 15:20:18 -05:00
parent 54500f32f0
commit daf6c51468
3 changed files with 3 additions and 3 deletions

View file

@ -137,7 +137,7 @@ object Rs2MapEditor {
for (column in 0 until mapWidth) {
gbc.gridx = column
gbc.gridy = row
val border: Border = MatteBorder(1, 1, if (row == mapHeight) 1 else 0, if (column == mapWidth) 1 else 0, Color.GRAY)
val border: Border = MatteBorder(1, 1, if (row == mapHeight) 1 else 0, if (column == mapWidth) 1 else 0, Color(255,255,255,25))
val flippedY = (64 - row) - 1
val point = Point(column, flippedY)
colorPointMap[point] = MapTileParser.definition.getTile(column, flippedY, plane).underlayId - 1

View file

@ -15,7 +15,7 @@ object GroundItemEncoder {
// Put data to buffer
item.forEach {
val formattedCoord = ((it.y or (it.x shl 7)) or (it.plane shl 14))
val formattedCoord = (it.plane shl 14) or (it.x shl 7) or it.y
buffer.putShort(formattedCoord.toShort())
buffer.putShort(it.id.toShort())
buffer.putShort(it.respawnTime.toShort())

View file

@ -12,7 +12,7 @@ object NPCSpawnEncoder {
val buffer = ByteBuffer.allocate(npc.size * 4)
npc.forEach {
val formattedCoord = ((it.y or (it.x shl 7)) or (it.plane shl 14))
val formattedCoord = (it.plane shl 14) or (it.x shl 7) or it.y
buffer.putShort(formattedCoord.toShort())
buffer.putShort(it.id.toShort())
}