diff --git a/lib/TerrarumSansBitmap.jar b/lib/TerrarumSansBitmap.jar index 16b369283..ba32af160 100644 Binary files a/lib/TerrarumSansBitmap.jar and b/lib/TerrarumSansBitmap.jar differ diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt index 56db3d33f..f005f4214 100644 --- a/src/net/torvald/terrarum/Terrarum.kt +++ b/src/net/torvald/terrarum/Terrarum.kt @@ -747,11 +747,11 @@ fun Float.round(): Float { fun SpriteBatch.fillRect(x: Float, y: Float, w: Float, h: Float) { this.draw(Terrarum.textureWhiteSquare, x, y, w, h) } -inline fun SpriteBatch.drawStraightLine(x: Float, y: Float, p2: Float, thickness: Float, isVertical: Boolean) { +inline fun SpriteBatch.drawStraightLine(x: Float, y: Float, length: Float, thickness: Float, isVertical: Boolean) { if (!isVertical) - this.fillRect(x, y, p2 - x, thickness) + this.fillRect(x, y, length - x, thickness) else - this.fillRect(x, y, thickness, p2 - y) + this.fillRect(x, y, thickness, length - y) } diff --git a/src/net/torvald/terrarum/console/CommandDict.kt b/src/net/torvald/terrarum/console/CommandDict.kt index 725a7670a..e769dff46 100644 --- a/src/net/torvald/terrarum/console/CommandDict.kt +++ b/src/net/torvald/terrarum/console/CommandDict.kt @@ -41,6 +41,7 @@ object CommandDict { "actorslist" to ActorsList, "setscale" to SetScale, "kill" to KillActor, + "money" to MoneyDisp, // Test codes "bulletintest" to SetBulletin, diff --git a/src/net/torvald/terrarum/console/MoneyDisp.kt b/src/net/torvald/terrarum/console/MoneyDisp.kt new file mode 100644 index 000000000..35254878f --- /dev/null +++ b/src/net/torvald/terrarum/console/MoneyDisp.kt @@ -0,0 +1,18 @@ +package net.torvald.terrarum.console + +import net.torvald.random.HQRNG + +object MoneyDisp : ConsoleCommand { + override fun execute(args: Array) { + if (args.size == 2) { + Echo("¤${0x3000.toChar()}${args[1]}") + } + else { + Echo("¤${0x3000.toChar()}${HQRNG().nextInt(100000)}") + } + } + + override fun printUsage() { + Echo("Usage: money [amount] — Prints given or random amount of money") + } +} \ No newline at end of file diff --git a/work_files/UI/inventory_nouveau_2.psd b/work_files/UI/inventory_nouveau_2.psd new file mode 100644 index 000000000..9a8581318 --- /dev/null +++ b/work_files/UI/inventory_nouveau_2.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d976f2e4c8b98076af04a44ab5b1fdc8a98f78af04ad4f5b78d02709c3942e0a +size 3037848