diff --git a/assets/graphics/fonts/code.tga b/assets/graphics/fonts/code.tga index 61b50808a..fa7ff0f3c 100644 --- a/assets/graphics/fonts/code.tga +++ b/assets/graphics/fonts/code.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8121f2770e4ed60f2d21dc0f6d96b9748577bce1805e91951e86ab8ba2aa1f5c +oid sha256:d7b69a92f8b54fc978b2335c5d92f4276d7c53eb2d8dda0465719c8fae8afcd4 size 36882 diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 222a3b779..43bd74334 100644 --- a/assets/mods/basegame/items/items.tga +++ b/assets/mods/basegame/items/items.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:684337cc90ba35cfd66b69efc20c436ecb52c88b562464b1207395392fe76790 +oid sha256:88fb9e931cc034088889950337e26254e66d5dd0709b4104d69661d37a27e23a size 2408466 diff --git a/src/net/torvald/terrarum/modulebasegame/gameworld/GamePostalService.kt b/src/net/torvald/terrarum/modulebasegame/gameworld/GamePostalService.kt index 03f8ca494..367713861 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameworld/GamePostalService.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameworld/GamePostalService.kt @@ -60,7 +60,7 @@ data class Post( } data class PostContents( - val type: String, // "text", "btex" + val type: String, // "text"(read from LANG), "textcustom"(custom string), "btex"(always custom) val contentsRaw: String, // plain text for "text"; xml for "btex" val encryption: String = "none", // "none", "end2end" val contentsExtra: Any? = null, diff --git a/src/net/torvald/terrarum/modulebasegame/gameworld/PostAutogenContentFactory.kt b/src/net/torvald/terrarum/modulebasegame/gameworld/PostAutogenContentFactory.kt new file mode 100644 index 000000000..13e3d34a5 --- /dev/null +++ b/src/net/torvald/terrarum/modulebasegame/gameworld/PostAutogenContentFactory.kt @@ -0,0 +1,37 @@ +package net.torvald.terrarum.modulebasegame.gameworld + +/** + * Created by minjaesong on 2025-02-16. + */ +object PostAutogenContentFactory { + + operator fun invoke(type: String, args: List?): PostContents { + TODO() + } + + @PostContentAutogenFunction + private fun moneyorder(args: List?): PostContents { + val UUID_SENDER = args!![0].toString() + val UUID_RECIPIENT = args!![1].toString() + + val xml = """ + + + + + <v fromgame="POSTAL_TITLE_MONEY_ORDER"/> + ${UUID_SENDER} + ${UUID_RECIPIENT} + + + + + + """.trimIndent() + + return PostContents("btex", xml) + } + +} + +annotation class PostContentAutogenFunction \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIRedeemCodeMachine.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIRedeemCodeMachine.kt index 82b12e7ab..f8c731e9b 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIRedeemCodeMachine.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIRedeemCodeMachine.kt @@ -57,7 +57,7 @@ class UIRedeemCodeMachine : UICanvas( private val thisOffsetX = UIInventoryFull.INVENTORY_CELLS_OFFSET_X() + UIItemInventoryElemSimple.height + UIItemInventoryItemGrid.listGap - halfSlotOffset private val yEnd = -UIInventoryFull.YPOS_CORRECTION + (App.scr.height + UIInventoryFull.internalHeight).div(2).toFloat() - private val alphnums = (('0'..'9') + ('a'..'z') + ('A'..'Z')).map { "$it" }.toHashSet() + private val alphnums = (('0'..'9') + ('a'..'z') + ('A'..'Z') + '@').map { "$it" }.toHashSet() override fun inputStrobed(e: TerrarumKeyboardEvent) { super.inputStrobed(e) diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 506321e09..a674c1529 100644 --- a/work_files/graphics/items/basegame_items.kra +++ b/work_files/graphics/items/basegame_items.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f4afef371b0113d534c1bb1499c88ffbc8e89832805ebad221e83877b8bac9a -size 1909878 +oid sha256:0627a8b88df26da1d240576cb6fff98d63abd8a0a6f5862d934f8cad088c4fed +size 1965087