From f5fba1e273a772c23daf700c17e311b41559b998 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 18 Dec 2017 20:45:32 +0900 Subject: [PATCH] rain megaparticle experiment --- .../terrarum-sans-bitmap/ascii_variable.tga | 2 +- .../terrarum-sans-bitmap/hayeren_variable.tga | 2 +- src/net/torvald/terrarum/Ingame.kt | 21 +++- src/net/torvald/terrarum/LoadScreen.kt | 10 +- src/net/torvald/terrarum/Terrarum.kt | 10 ++ .../torvald/terrarum/TerrarumAppLoader.java | 5 +- .../terrarum/gameactors/ActorHumanoid.kt | 90 ++++++++++++--- .../terrarum/gameactors/ActorWithPhysics.kt | 40 ++++--- .../terrarum/gameactors/ParticleBase.kt | 20 ++-- .../terrarum/gameactors/ParticleMegaRain.kt | 107 ++++++++++++++++++ .../terrarum/gameactors/ParticleTestRain.kt | 2 +- .../torvald/terrarum/weather/WeatherMixer.kt | 18 +-- .../terrarum/worlddrawer/BlocksDrawerNew.kt | 17 ++- work_files/graphics/fonts/ascii_variable.psd | 4 +- .../graphics/fonts/hayeren_variable.psd | 4 +- .../fonts/terrarumsansbitmap_ascii_small.psd | 3 + 16 files changed, 286 insertions(+), 69 deletions(-) create mode 100644 src/net/torvald/terrarum/gameactors/ParticleMegaRain.kt create mode 100644 work_files/graphics/fonts/terrarumsansbitmap_ascii_small.psd diff --git a/assets/graphics/fonts/terrarum-sans-bitmap/ascii_variable.tga b/assets/graphics/fonts/terrarum-sans-bitmap/ascii_variable.tga index 0d7f00f14..6efe916c6 100644 --- a/assets/graphics/fonts/terrarum-sans-bitmap/ascii_variable.tga +++ b/assets/graphics/fonts/terrarum-sans-bitmap/ascii_variable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50588210227daf6e621f931b6d81f9f8ac8a297f7e79d1cab2f0c479fa42c033 +oid sha256:f03516c86ddde0b73c7242a37b941d80e6eee88df3f8868bfcde8c61cad1cb89 size 327724 diff --git a/assets/graphics/fonts/terrarum-sans-bitmap/hayeren_variable.tga b/assets/graphics/fonts/terrarum-sans-bitmap/hayeren_variable.tga index 9ca7a6223..c140c460b 100644 --- a/assets/graphics/fonts/terrarum-sans-bitmap/hayeren_variable.tga +++ b/assets/graphics/fonts/terrarum-sans-bitmap/hayeren_variable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc47cef77ec40d8d3ba03aa3cd7315818e463b2979094de39a3817fac1f7c541 +oid sha256:20cf1ff531ee5804d82b449bb1aa44b3f84b735d7f692c1375d938766f0b0f00 size 122924 diff --git a/src/net/torvald/terrarum/Ingame.kt b/src/net/torvald/terrarum/Ingame.kt index 9f9d5e4b8..ccea6600d 100644 --- a/src/net/torvald/terrarum/Ingame.kt +++ b/src/net/torvald/terrarum/Ingame.kt @@ -127,6 +127,8 @@ class Ingame(val batch: SpriteBatch) : Screen { private lateinit var uiTooltip: UITooltip + lateinit var uiCheatMotherfuckerNootNoot: UICheatDetected + // UI aliases lateinit var uiAliases: ArrayList private set @@ -288,6 +290,10 @@ class Ingame(val batch: SpriteBatch) : Screen { //FeaturesDrawer.world = this.world + MegaRainGovernor // invoke MegaRain Governor + + + Gdx.input.inputProcessor = ingameController @@ -361,6 +367,9 @@ class Ingame(val batch: SpriteBatch) : Screen { uiTooltip = UITooltip() + uiCheatMotherfuckerNootNoot = UICheatDetected() + + // batch-process uiAliases uiAliases = arrayListOf( // drawn first @@ -378,7 +387,8 @@ class Ingame(val batch: SpriteBatch) : Screen { uiAlasesPausing = arrayListOf( uiInventoryPlayer, //uiInventoryContainer, - consoleHandler + consoleHandler, + uiCheatMotherfuckerNootNoot ) uiAlasesPausing.forEach { addUI(it) } // put them all to the UIContainer uiAliases.forEach { addUI(it) } // put them all to the UIContainer @@ -391,6 +401,15 @@ class Ingame(val batch: SpriteBatch) : Screen { LightmapRenderer.fireRecalculateEvent() + + + + + + // some sketchy test code here + + + }// END enter diff --git a/src/net/torvald/terrarum/LoadScreen.kt b/src/net/torvald/terrarum/LoadScreen.kt index a6e62a151..e55703872 100644 --- a/src/net/torvald/terrarum/LoadScreen.kt +++ b/src/net/torvald/terrarum/LoadScreen.kt @@ -168,7 +168,7 @@ object LoadScreen : ScreenAdapter() { it.color = Color.WHITE - Terrarum.fontGame.draw(it, textToPrint, (textFbo.width - textWidth) / 2f + 0.33f, 0f) // x 0.33? I dunno but it breaks w/o it + Terrarum.fontGame.draw(it, textToPrint, ((textFbo.width - textWidth) / 2).toInt().toFloat(), 0f) blendMul() @@ -188,6 +188,14 @@ object LoadScreen : ScreenAdapter() { it.projectionMatrix = camera.combined blendNormal() + + // almost black background + it.color = Color(0x181818ff) + it.fillRect(0f, 0f, Terrarum.WIDTH.toFloat(), Terrarum.HEIGHT.toFloat()) + + + it.color = Color.WHITE + // draw text FBO to screen val textTex = textFbo.colorBufferTexture textTex.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear) diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt index 56f45ea65..08bb9909c 100644 --- a/src/net/torvald/terrarum/Terrarum.kt +++ b/src/net/torvald/terrarum/Terrarum.kt @@ -815,6 +815,16 @@ infix fun Color.minus(other: Color) = Color( // don't turn into an operator! fun Int.toHex() = this.toLong().and(0xFFFFFFFF).toString(16).padStart(8, '0').toUpperCase() +fun MutableList.shuffle() { + for (i in this.size - 1 downTo 1) { + val rndIndex = (Math.random() * (i + 1)).toInt() + + val t = this[rndIndex] + this[rndIndex] = this[i] + this[i] = t + } +} + val ccW = GameFontBase.toColorCode(0xFFFF) val ccY = GameFontBase.toColorCode(0xFE8F) diff --git a/src/net/torvald/terrarum/TerrarumAppLoader.java b/src/net/torvald/terrarum/TerrarumAppLoader.java index 69c355a9d..df7a6d15d 100644 --- a/src/net/torvald/terrarum/TerrarumAppLoader.java +++ b/src/net/torvald/terrarum/TerrarumAppLoader.java @@ -110,8 +110,8 @@ public class TerrarumAppLoader implements ApplicationListener { private SpriteBatch batch; public static TextureRegion logo; - private Color gradWhiteTop = new Color(0xf8f8f8ff); - private Color gradWhiteBottom = new Color(0xd8d8d8ff); + private Color gradWhiteTop = new Color(0xd8d8d8ff); + private Color gradWhiteBottom = new Color(0xf8f8f8ff); public Screen screen; @@ -160,7 +160,6 @@ public class TerrarumAppLoader implements ApplicationListener { logo = new TextureRegion(new Texture(Gdx.files.internal("assets/graphics/logo_placeholder.tga"))); - logo.flip(false, true); TextureRegionPack.Companion.setGlobalFlipY(true); diff --git a/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt b/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt index da887bb2f..0f2da4e6d 100644 --- a/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt +++ b/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt @@ -11,6 +11,7 @@ import net.torvald.terrarum.itemproperties.Material import net.torvald.terrarum.realestate.LandUtil import net.torvald.terrarum.ui.UIInventoryFull import net.torvald.terrarum.worlddrawer.LightmapRenderer +import org.dyn4j.geometry.Vector2 import java.util.* /** @@ -473,30 +474,89 @@ open class ActorHumanoid( isWalkingV = false } + private fun getJumpAcc(pwr: Double, timedJumpCharge: Double): Double { + return pwr * timedJumpCharge * JUMP_ACCELERATION_MOD * Math.sqrt(scale) // positive value + } + + private var oldMAX_JUMP_LENGTH = -1 // init + private var oldJUMPPOWER = -1.0 // init + private var oldJUMPPOWERBUFF = -1.0 // init + private var oldScale = -1.0 + private var oldDragCoefficient = -1.0 + val jumpAirTime: Double = -1.0 + get() { + // compare all the affecting variables + if (oldMAX_JUMP_LENGTH == MAX_JUMP_LENGTH && + oldJUMPPOWER == actorValue.getAsDouble(AVKey.JUMPPOWER)!! && + oldJUMPPOWERBUFF == actorValue.getAsDouble(AVKey.JUMPPOWERBUFF) ?: 1.0 && + oldScale == scale && + oldDragCoefficient == dragCoefficient) { + return field + } + // if variables are changed, get new value, store it and return it + else { + oldMAX_JUMP_LENGTH = MAX_JUMP_LENGTH + oldJUMPPOWER = actorValue.getAsDouble(AVKey.JUMPPOWER)!! + oldJUMPPOWERBUFF = actorValue.getAsDouble(AVKey.JUMPPOWERBUFF) ?: 1.0 + oldScale = scale + oldDragCoefficient = dragCoefficient + + + var frames = 0 + + var simYPos = 0.0 + var forceVec = Vector2(0.0, 0.0) + var jmpCtr = 0 + while (true) { + if (jmpCtr < MAX_JUMP_LENGTH) jmpCtr++ + + + val timedJumpCharge = jumpFunc(MAX_JUMP_LENGTH, jmpCtr) + forceVec.y -= getJumpAcc(jumpPower, timedJumpCharge) + forceVec.y += getDrag(forceVec).y + + simYPos += forceVec.y // ignoring all the fluid drag OTHER THAN THE AIR + + + if ((simYPos >= 0.0 && frames > 0) || frames >= 1000) break + + + frames++ + } + + + field = frames * (1.0 / Terrarum.TARGET_FPS) + // fixme: looks good but return value is wrong -- 2.25 seconds? when I jump it barely goes past 1 sec + + + return field + } + } + + private val jumpPower: Double + get() = actorValue.getAsDouble(AVKey.JUMPPOWER)!! * (actorValue.getAsDouble(AVKey.JUMPPOWERBUFF) ?: 1.0) + + private fun jumpFunc(len: Int, counter: Int): Double { + // linear time mode + val init = (len + 1) / 2.0 + var timedJumpCharge = init - init / len * counter + if (timedJumpCharge < 0) timedJumpCharge = 0.0 + return timedJumpCharge + } + /** * See ./work_files/Jump power by pressing time.gcx * * TODO linear function (play Super Mario Bros. and you'll get what I'm talking about) -- SCRATCH THAT! */ private fun jump() { - val len = MAX_JUMP_LENGTH.toFloat() - val pwr = actorValue.getAsDouble(AVKey.JUMPPOWER)!! * (actorValue.getAsDouble(AVKey.JUMPPOWERBUFF) ?: 1.0) - - fun jumpFunc(counter: Int): Double { - // linear time mode - val init = (len + 1) / 2.0 - var timedJumpCharge = init - init / len * counter - if (timedJumpCharge < 0) timedJumpCharge = 0.0 - return timedJumpCharge - } - if (jumping) {// && jumpable) { // increment jump counter - if (jumpCounter < len) jumpCounter += 1 + if (jumpCounter < MAX_JUMP_LENGTH) jumpCounter += 1 - val timedJumpCharge = jumpFunc(jumpCounter) + val timedJumpCharge = jumpFunc(MAX_JUMP_LENGTH, jumpCounter) - jumpAcc = pwr * timedJumpCharge * JUMP_ACCELERATION_MOD * Math.sqrt(scale) // positive value + jumpAcc = getJumpAcc(jumpPower, timedJumpCharge) controllerMoveDelta?.y?.let { controllerMoveDelta!!.y -= jumpAcc } // feed negative value to the vector // do not think of resetting this to zero when counter hit the ceiling; that's HOW NOT @@ -510,7 +570,7 @@ open class ActorHumanoid( }*/ // release "jump key" of AIs - if (jumpCounter >= len && !isGamer) { + if (jumpCounter >= MAX_JUMP_LENGTH && !isGamer) { isJumpDown = false jumping = false jumpCounter = 0 diff --git a/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt b/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt index 8022236ed..0dfc0ab45 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt @@ -493,6 +493,27 @@ open class ActorWithPhysics(val world: GameWorld, renderOrder: RenderOrder, val } }*/ + fun getDrag(externalForce: Vector2): Vector2 { + /** + * weight; gravitational force in action + * W = mass * G (9.8 [m/s^2]) + */ + val W: Vector2 = gravitation * Terrarum.TARGET_FPS.toDouble() + /** + * Area + */ + val A: Double = (scale * baseHitboxW / METER) * (scale * baseHitboxW / METER) + /** + * Drag of atmosphere + * D = Cd (drag coefficient) * 0.5 * rho (density) * V^2 (velocity sqr) * A (area) + */ + val D: Vector2 = Vector2(externalForce.x.magnSqr(), externalForce.y.magnSqr()) * dragCoefficient * 0.5 * A// * tileDensityFluid.toDouble() + + val V: Vector2 = (W - D) / Terrarum.TARGET_FPS.toDouble() * SI_TO_GAME_ACC + + return V + } + /** * Apply gravitation to the every falling body (unless not levitating) * @@ -502,24 +523,7 @@ open class ActorWithPhysics(val world: GameWorld, renderOrder: RenderOrder, val if (!isNoSubjectToGrav && !(gravitation.y > 0 && walledBottom || gravitation.y < 0 && walledTop)) { //if (!isWalled(hitbox, COLLIDING_BOTTOM)) { - /** - * weight; gravitational force in action - * W = mass * G (9.8 [m/s^2]) - */ - val W: Vector2 = gravitation * Terrarum.TARGET_FPS.toDouble() - /** - * Area - */ - val A: Double = (scale * baseHitboxW / METER) * (scale * baseHitboxW / METER) - /** - * Drag of atmosphere - * D = Cd (drag coefficient) * 0.5 * rho (density) * V^2 (velocity sqr) * A (area) - */ - val D: Vector2 = Vector2(externalForce.x.magnSqr(), externalForce.y.magnSqr()) * dragCoefficient * 0.5 * A// * tileDensityFluid.toDouble() - - val V: Vector2 = (W - D) / Terrarum.TARGET_FPS.toDouble() * SI_TO_GAME_ACC - - applyForce(V) + applyForce(getDrag(externalForce)) //} } } diff --git a/src/net/torvald/terrarum/gameactors/ParticleBase.kt b/src/net/torvald/terrarum/gameactors/ParticleBase.kt index 7c0e977ca..d5cfec8da 100644 --- a/src/net/torvald/terrarum/gameactors/ParticleBase.kt +++ b/src/net/torvald/terrarum/gameactors/ParticleBase.kt @@ -15,7 +15,7 @@ import org.dyn4j.geometry.Vector2 * * Created by minjaesong on 2017-01-20. */ -open class ParticleBase(renderOrder: Actor.RenderOrder, maxLifeTime: Second? = null) : Runnable { +open class ParticleBase(renderOrder: Actor.RenderOrder, val despawnUponCollision: Boolean, maxLifeTime: Second? = null) : Runnable { /** Will NOT actually delete from the CircularArray */ @Volatile var flagDespawn = false @@ -41,12 +41,18 @@ open class ParticleBase(renderOrder: Actor.RenderOrder, maxLifeTime: Second? = n fun update(delta: Float) { if (!flagDespawn) { lifetimeCounter += delta - if (velocity.isZero || lifetimeCounter >= lifetimeMax || - // simple stuck check - BlockCodex[Terrarum.ingame!!.world.getTileFromTerrain( - hitbox.canonicalX.div(TILE_SIZE).floorInt(), - hitbox.canonicalY.div(TILE_SIZE).floorInt() - ) ?: Block.STONE].isSolid) { + if (despawnUponCollision) { + if (velocity.isZero || + // simple stuck check + BlockCodex[Terrarum.ingame!!.world.getTileFromTerrain( + hitbox.canonicalX.div(TILE_SIZE).floorInt(), + hitbox.canonicalY.div(TILE_SIZE).floorInt() + ) ?: Block.STONE].isSolid) { + flagDespawn = true + } + } + + if (lifetimeCounter >= lifetimeMax) { flagDespawn = true } diff --git a/src/net/torvald/terrarum/gameactors/ParticleMegaRain.kt b/src/net/torvald/terrarum/gameactors/ParticleMegaRain.kt new file mode 100644 index 000000000..5aac6a78f --- /dev/null +++ b/src/net/torvald/terrarum/gameactors/ParticleMegaRain.kt @@ -0,0 +1,107 @@ +package net.torvald.terrarum.gameactors + +import com.badlogic.gdx.graphics.Pixmap +import com.badlogic.gdx.graphics.Texture +import com.badlogic.gdx.graphics.g2d.TextureRegion +import net.torvald.random.HQRNG +import net.torvald.terrarum.ModMgr +import net.torvald.terrarum.Terrarum + +/** + * Created by minjaesong on 2017-12-18. + */ +class ParticleMegaRain(posX: Double, posY: Double) : ParticleBase(Actor.RenderOrder.BEHIND, false, 3.2f) { + + init { + body = MegaRainGovernor.get() + val w = body.regionWidth.toDouble() + val h = body.regionHeight.toDouble() + hitbox.setFromWidthHeight( + posX - w.times(0.5), + posY - h.times(0.5), + w, h + ) + + velocity.y = 18.0 + } + +} + +object MegaRainGovernor { + + private var reseedTimer = 0f + var reseedTime: Second = 90f + + private val body = Pixmap(ModMgr.getGdxFile("basegame", "weathers/raindrop.tga")) + private lateinit var bodies: Array + + private var withdrawCounter = 0 + + init { + seed() + } + + private fun seed() { + val w = body.width + val h = body.height + + bodies = Array(1024) { + val pixmap = Pixmap(Terrarum.WIDTH * 2, Terrarum.HEIGHT / 4, Pixmap.Format.RGBA8888) + + val rng = HQRNG() + + repeat(64) { + val rndX = rng.nextInt(pixmap.width - body.width) + val rndY = rng.nextInt(pixmap.height - body.height) + + pixmap.drawPixmap(body, rndX, rndY) + } + + // return composed (mega)pixmap + val region = TextureRegion(Texture(pixmap)) + region.flip(false, true) + + /*return*/region + } + + // randomise + bodies.shuffle() + } + + fun get(): TextureRegion { + if (withdrawCounter >= bodies.size) { + withdrawCounter = 0 + bodies.shuffle() + } + + return bodies[withdrawCounter++] + } + + @Deprecated("re-seeding freezes the game a little and large enough randomnesses ought to be good") + fun update(delta: Float) { + if (reseedTimer >= reseedTime) { + seed() + reseedTimer -= reseedTime + } + + reseedTimer += delta + } + + fun resize() { + seed() + withdrawCounter = 0 + reseedTimer = 0f + } + + + + fun Array.shuffle() { + for (i in this.size - 1 downTo 1) { + val rndIndex = (Math.random() * (i + 1)).toInt() + + val t = this[rndIndex] + this[rndIndex] = this[i] + this[i] = t + } + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/gameactors/ParticleTestRain.kt b/src/net/torvald/terrarum/gameactors/ParticleTestRain.kt index bb263d417..8145f04b1 100644 --- a/src/net/torvald/terrarum/gameactors/ParticleTestRain.kt +++ b/src/net/torvald/terrarum/gameactors/ParticleTestRain.kt @@ -7,7 +7,7 @@ import net.torvald.terrarum.ModMgr /** * Created by minjaesong on 2017-01-20. */ -class ParticleTestRain(posX: Double, posY: Double) : ParticleBase(Actor.RenderOrder.BEHIND, 6f) { +class ParticleTestRain(posX: Double, posY: Double) : ParticleBase(Actor.RenderOrder.BEHIND, true, 6f) { init { body = TextureRegion(Texture(ModMgr.getGdxFile("basegame", "weathers/raindrop.tga"))) diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt index 5e6267e1a..8aee96016 100644 --- a/src/net/torvald/terrarum/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -9,6 +9,7 @@ import net.torvald.colourutil.* import net.torvald.random.HQRNG import net.torvald.terrarum.* import net.torvald.terrarum.gameactors.ActorWithBody +import net.torvald.terrarum.gameactors.ParticleMegaRain import net.torvald.terrarum.gameactors.ParticleTestRain import net.torvald.terrarum.gamecontroller.KeyToggler import net.torvald.terrarum.gameworld.GameWorld @@ -80,18 +81,19 @@ object WeatherMixer { // test rain toggled by F2 - /*if (KeyToggler.isOn(Input.Keys.F2)) { - val playerPos = player.centrePosPoint - kotlin.repeat(4) { + if (KeyToggler.isOn(Input.Keys.F2)) { + val playerPosX = player.hitbox.centeredX + val playerPosY = player.hitbox.centeredY + kotlin.repeat(1) { // 4 seems good - val rainParticle = ParticleTestRain( - playerPos.x + HQRNG().nextInt(Terrarum.WIDTH) - Terrarum.HALFW, - playerPos.y - Terrarum.HALFH + val rainParticle = ParticleMegaRain( + playerPosX + HQRNG().nextInt(Terrarum.WIDTH) - Terrarum.HALFW, + playerPosY - Terrarum.HALFH ) Terrarum.ingame!!.addParticle(rainParticle) } - globalLightNow.set(getGlobalLightOfTime(world.time.todaySeconds).mul(0.3f, 0.3f, 0.3f, 0.58f)) - }*/ + //globalLightNow.set(getGlobalLightOfTime(Terrarum.ingame!!.world.time.todaySeconds).mul(0.3f, 0.3f, 0.3f, 0.58f)) + } } diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt index 53350d5b8..e9c258727 100644 --- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt +++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt @@ -134,17 +134,16 @@ object BlocksDrawer { for (tileID in ITEM_TILES) { - val tile = tilesTerrain.get((tileID % 16) * 16, (tileID / 16)) + val tileX = (tileID % 16) * 16 + val tileY = tileID / 16 + val tile = tilesTerrain.get(tileX, tileY) + // slow memory copy :\ I'm afraid I can't random-access bytebuffer... - for (y in 0..TILE_SIZE - 1) { - for (x in 0..TILE_SIZE - 1) { - tileItemImgPixMap.pixels.putInt( - terrainPixMap.getPixel( - tile.regionX + x, - tile.regionY + y - ) - ) + for (scanline in 0 until tileItemImgPixMap.height) { + for (x in 0 until TILE_SIZE) { + val pixel = terrainPixMap.getPixel(tileX + x, scanline) + tileItemImgPixMap.drawPixel(x + TILE_SIZE * (tileID % 16), scanline, pixel) } } } diff --git a/work_files/graphics/fonts/ascii_variable.psd b/work_files/graphics/fonts/ascii_variable.psd index 3c66dfe6b..d391bbc3f 100644 --- a/work_files/graphics/fonts/ascii_variable.psd +++ b/work_files/graphics/fonts/ascii_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76c1c6ef2f1135e8039beca7008efff75987b1636e28fa810be82623edf3ac0b -size 327049 +oid sha256:add9ad5ad33224c6c06c8c671a75089a32f2f65f88910c2eaf03f1f74f893ea1 +size 327061 diff --git a/work_files/graphics/fonts/hayeren_variable.psd b/work_files/graphics/fonts/hayeren_variable.psd index 22d53039c..8b9c510fb 100644 --- a/work_files/graphics/fonts/hayeren_variable.psd +++ b/work_files/graphics/fonts/hayeren_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f0488e7a31dd6c7f76a3b6b5af957b3a3bd41a0da29181b83158440e61b4514 -size 138060 +oid sha256:e9736dfe386926f7cc3fc3b9c17a785d91646ae9c65a4dfc44bd55412bb01675 +size 138073 diff --git a/work_files/graphics/fonts/terrarumsansbitmap_ascii_small.psd b/work_files/graphics/fonts/terrarumsansbitmap_ascii_small.psd new file mode 100644 index 000000000..937d6ec5f --- /dev/null +++ b/work_files/graphics/fonts/terrarumsansbitmap_ascii_small.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb4bfdb6db11de809f631c75f298d9da5bbfdfa4fe00f736ff4db60b7affe3e0 +size 31255