diff --git a/.gitignore b/.gitignore index a55ef2111..18f1d2f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ assets/mods/basegame/demoworld.gz external_resource_packs.zip .idea/workspace.xml .tmp* +external_resource_packs.zip diff --git a/external_resource_packs/28150__commanderrobot__clean-klick.wav b/external_resource_packs/28150__commanderrobot__clean-klick.wav deleted file mode 100644 index 5f60da0f0..000000000 Binary files a/external_resource_packs/28150__commanderrobot__clean-klick.wav and /dev/null differ diff --git a/external_resource_packs/60835__pogotron__swishes.wav b/external_resource_packs/60835__pogotron__swishes.wav deleted file mode 100644 index 1d4fb166c..000000000 Binary files a/external_resource_packs/60835__pogotron__swishes.wav and /dev/null differ diff --git a/external_resource_packs/spieluhr.wav b/external_resource_packs/spieluhr.wav deleted file mode 100644 index 099d0da2a..000000000 Binary files a/external_resource_packs/spieluhr.wav and /dev/null differ diff --git a/external_resource_packs/watersplash/103313__m-o-m__impact-splash-water-01_cc_by_nc.wav b/external_resource_packs/watersplash/103313__m-o-m__impact-splash-water-01_cc_by_nc.wav deleted file mode 100644 index 66102bd04..000000000 Binary files a/external_resource_packs/watersplash/103313__m-o-m__impact-splash-water-01_cc_by_nc.wav and /dev/null differ diff --git a/external_resource_packs/watersplash/110393__soundscalpel-com__water-splash_cc_by.wav b/external_resource_packs/watersplash/110393__soundscalpel-com__water-splash_cc_by.wav deleted file mode 100644 index d42954682..000000000 Binary files a/external_resource_packs/watersplash/110393__soundscalpel-com__water-splash_cc_by.wav and /dev/null differ diff --git a/external_resource_packs/watersplash/53687__digifishmusic__ploppy-4_cc_by.wav b/external_resource_packs/watersplash/53687__digifishmusic__ploppy-4_cc_by.wav deleted file mode 100644 index 10b186af5..000000000 Binary files a/external_resource_packs/watersplash/53687__digifishmusic__ploppy-4_cc_by.wav and /dev/null differ diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt index 13500a2fa..a67162d14 100644 --- a/src/net/torvald/terrarum/TitleScreen.kt +++ b/src/net/torvald/terrarum/TitleScreen.kt @@ -20,9 +20,11 @@ import net.torvald.terrarum.modulebasegame.Ingame import net.torvald.terrarum.modulebasegame.IngameRenderer import net.torvald.terrarum.modulebasegame.gameactors.* import net.torvald.terrarum.modulebasegame.gameworld.GameWorldExtension +import net.torvald.terrarum.modulebasegame.ui.UIRemoCon import net.torvald.terrarum.serialise.ReadLayerData import net.torvald.terrarum.ui.UICanvas import net.torvald.terrarum.modulebasegame.ui.UITitleRemoConRoot +import net.torvald.terrarum.modulebasegame.ui.UITitleRemoConYaml import net.torvald.terrarum.modulebasegame.weather.WeatherMixer import net.torvald.terrarum.worlddrawer.* import java.io.FileInputStream @@ -156,7 +158,7 @@ class TitleScreen(val batch: SpriteBatch) : Screen { //FeaturesDrawer.world = demoWorld - uiMenu = UITitleRemoConRoot() + uiMenu = UIRemoCon(UITitleRemoConYaml())//UITitleRemoConRoot() uiMenu.setPosition(0, 0) uiMenu.setAsOpen() diff --git a/src/net/torvald/terrarum/modulebasegame/console/JavaIMTest.kt b/src/net/torvald/terrarum/modulebasegame/console/JavaIMTest.kt index 7e58b4744..6840a643b 100644 --- a/src/net/torvald/terrarum/modulebasegame/console/JavaIMTest.kt +++ b/src/net/torvald/terrarum/modulebasegame/console/JavaIMTest.kt @@ -1,8 +1,10 @@ package net.torvald.terrarum.modulebasegame.console +import com.badlogic.gdx.Gdx +import com.badlogic.gdx.Input import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.Echo -import net.torvald.terrarum.swingapp.IMStringReader +//import net.torvald.terrarum.swingapp.IMStringReader /** * Created by minjaesong on 2017-02-05. @@ -11,10 +13,19 @@ import net.torvald.terrarum.swingapp.IMStringReader internal object JavaIMTest : ConsoleCommand { override fun execute(args: Array) { - IMStringReader( + /*IMStringReader( { Echo("[JavaIMTest -> IMStringReader] $it") }, // send input to Echo "JavaIMTest" - ) + )*/ + val inputListener = object : Input.TextInputListener { + override fun input(text: String?) { + Echo("[TextInputText] $text") + } + override fun canceled() { + Echo("[TextInputText] (input canceled)") + } + } + Gdx.input.getTextInput(inputListener, "TextInputTest", "Testing the text input", "type anything!") } override fun printUsage() { diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt index c4ef425ce..b2aa82a47 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt @@ -60,16 +60,16 @@ class UIInventoryFull( val catBarWidth = 330 - val catBar = UIItemInventoryCatBar( + val categoryBar = UIItemInventoryCatBar( this, (Terrarum.WIDTH - catBarWidth) / 2, 66 + (Terrarum.HEIGHT - internalHeight) / 2, catBarWidth ) val catSelection: Int - get() = catBar.selectedIndex + get() = categoryBar.selectedIndex val catSelectedIcon: Int - get() = catBar.selectedIcon + get() = categoryBar.selectedIcon override var openCloseTime: Second = 0.0f @@ -101,12 +101,16 @@ class UIInventoryFull( init { - addItem(catBar) + addItem(categoryBar) itemList?.let { addItem(it) } equipped?.let { addItem(it) } - catBar.selectionChangeListener = { old, new -> rebuildList() } + categoryBar.selectionChangeListener = { old, new -> + rebuildList() + itemList?.itemPage = 0 // set scroll to zero + itemList?.rebuild() // have to manually rebuild, too! + } @@ -125,7 +129,7 @@ class UIInventoryFull( } - catBar.update(delta) + categoryBar.update(delta) itemList?.update(delta) equipped?.update(delta) } @@ -163,7 +167,7 @@ class UIInventoryFull( batch.begin() // UI items - catBar.render(batch, camera) + categoryBar.render(batch, camera) itemList?.render(batch, camera) equipped?.render(batch, camera) @@ -221,7 +225,7 @@ class UIInventoryFull( } override fun dispose() { - catBar.dispose() + categoryBar.dispose() itemList?.dispose() equipped?.dispose() } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt index caca10827..f482ac934 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt @@ -183,12 +183,12 @@ class UIItemInventoryDynamicList( } scrollUpButton.clickOnceListener = { _, _, _ -> - itemPage = (itemPage - 1).fmod(itemPageCount) + itemPage = if (itemPageCount == 0) 0 else (itemPage - 1).fmod(itemPageCount) scrollUpButton.highlighted = false rebuild() } scrollDownButton.clickOnceListener = { _, _, _ -> - itemPage = (itemPage + 1).fmod(itemPageCount) + itemPage = if (itemPageCount == 0) 0 else (itemPage + 1).fmod(itemPageCount) scrollDownButton.highlighted = false rebuild() } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIRemoCon.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIRemoCon.kt new file mode 100644 index 000000000..96754be92 --- /dev/null +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIRemoCon.kt @@ -0,0 +1,161 @@ +package net.torvald.terrarum.modulebasegame.ui + +import com.badlogic.gdx.Gdx +import com.badlogic.gdx.Input +import com.badlogic.gdx.graphics.Camera +import com.badlogic.gdx.graphics.Color +import com.badlogic.gdx.graphics.g2d.SpriteBatch +import net.torvald.terrarum.Second +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.ui.UICanvas +import net.torvald.terrarum.ui.UIItemTextButton +import net.torvald.terrarum.ui.UIItemTextButtonList +import java.util.* +import kotlin.collections.ArrayList + +/** + * Created by minjaesong on 2018-08-29. + */ +class UIRemoCon(treeRepresentation: QNDTreeNode) : UICanvas() { + + override var openCloseTime = 0f + + private var remoConTray: UIRemoConElement // this remocon is dynamically generated + private var currentRemoConContents = treeRepresentation + + override var width = remoConWidth + override var height: Int + get() = remoConTray.height + set(value) {} + + init { + remoConTray = generateNewRemoCon(currentRemoConContents) + } + + private var mouseActionAvailable = true + + private fun generateNewRemoCon(node: QNDTreeNode): UIRemoConElement { + val dynamicStrArray = Array(node.children.size, { node.children[it].data ?: "(null)" }) + return UIRemoConElement(this, dynamicStrArray) + } + + override fun updateUI(delta: Float) { + if (mouseActionAvailable) { + remoConTray.update(delta) + + mouseActionAvailable = false + } + + val selectedItem = remoConTray.selectedItem + val selectedIndex = remoConTray.selectedIndex + + selectedItem?.let { + if (it.labelText == "MENU_LABEL_RETURN") { + if (currentRemoConContents.parent != null) { + remoConTray.consume() + + currentRemoConContents = currentRemoConContents.parent!! + remoConTray = generateNewRemoCon(currentRemoConContents) + } + else { + throw NullPointerException("No parent node to return") + } + } + else { + // check if target exists + //println("current node: ${currentRemoConContents.data}") + //currentRemoConContents.children.forEach { println("- ${it.data}") } + + if (currentRemoConContents.children.size > selectedIndex ?: 0x7FFFFFFF) { + + // only go deeper if that node has child to navigate + if (currentRemoConContents.children[selectedIndex!!].children.size != 0) { + remoConTray.consume() + currentRemoConContents = currentRemoConContents.children[selectedIndex!!] + remoConTray = generateNewRemoCon(currentRemoConContents) + } + } + else { + throw RuntimeException("Index: $selectedIndex, Size: ${currentRemoConContents.children.size}") + } + } + } + + + if (!Gdx.input.isButtonPressed(Input.Buttons.LEFT)) { + mouseActionAvailable = true + } + } + + override fun renderUI(batch: SpriteBatch, camera: Camera) { + remoConTray.render(batch, camera) + + } + + override fun doOpening(delta: Float) { + + } + + override fun doClosing(delta: Float) { + + } + + override fun endOpening(delta: Float) { + + } + + override fun endClosing(delta: Float) { + + } + + override fun dispose() { + + } + + class UIRemoConElement(uiRemoCon: UIRemoCon, val labels: Array) { + + + private val menubar = UIItemTextButtonList( + uiRemoCon, + labels, + 0, menubarOffY, + uiRemoCon.width, getRemoConHeight(labels), + textAreaWidth = uiRemoCon.width, + readFromLang = true, + activeBackCol = Color(0), + highlightBackCol = Color(0), + backgroundCol = Color(0), + inactiveCol = Color.WHITE, + defaultSelection = null + ) + + fun update(delta: Float) { + menubar.update(delta) + } + + fun render(batch: SpriteBatch, camera: Camera) { + menubar.render(batch, camera) + } + + // nullifies currently selected item + fun consume() { + menubar.selectedIndex = null + } + + /** null if none are selected */ + val selectedItem: UIItemTextButton? + get() = menubar.selectedButton + /** null if none are selected */ + val selectedIndex: Int? + get() = menubar.selectedIndex + + val height = getRemoConHeight(labels) + } + + companion object { + val remoConWidth = 280 + fun getRemoConHeight(menu: ArrayList) = 36 * menu.size.plus(1) + fun getRemoConHeight(menu: Array) = 36 * menu.size.plus(1) + val menubarOffY: Int; get() = Terrarum.HEIGHT / 2 - (Terrarum.fontGame.lineHeight * 1.5).toInt() + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt new file mode 100644 index 000000000..40df382e2 --- /dev/null +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt @@ -0,0 +1,106 @@ +package net.torvald.terrarum.modulebasegame.ui + +import java.util.* + + + +object UITitleRemoConYaml { + + // YAML indent with a space! + + val menus = """ + - MENU_MODE_SINGLEPLAYER + - MENU_LABEL_RETURN + - MENU_MODE_MULTIPLAYER + - MENU_LABEL_RETURN + - MENU_OPTIONS + - MENU_OPTIONS_GRAPHICS + - MENU_OPTIONS_CONTROLS + - MENU_OPTIONS_SOUND + - MENU_LABEL_RETURN + - MENU_MODULES + - MENU_LABEL_RETURN + - MENU_LABEL_LANGUAGE + - MENU_LABEL_RETURN + - MENU_LABEL_CREDITS + - MENU_LABEL_CREDITS + - MENU_CREDIT_GPL_DNT + - MENU_LABEL_RETURN + - MENU_LABEL_QUIT + """.trimIndent() + + val debugTools = """ + - Development Tools $ + - Building Maker + """.trimIndent() + + operator fun invoke() = parseYamlList(menus) + + fun parseYamlList(yaml: String): QNDTreeNode { + var currentIndentLevel = -1 + val root = QNDTreeNode() + var currentNode = root + val nodesStack = Stack>() + + nodesStack.push(currentNode) + + yaml.split('\n') .forEach { + val indentLevel = it.countSpaces() + val it = it.trimIndent() + if (it.startsWith("- ")) { + val nodeName = it.drop(2) + + if (indentLevel == currentIndentLevel) { + val sibling = QNDTreeNode(nodeName, currentNode.parent) + currentNode.parent!!.children.add(sibling) + currentNode = sibling + } + else if (indentLevel > currentIndentLevel) { + val childNode = QNDTreeNode(nodeName, currentNode) + currentNode.children.add(childNode) + nodesStack.push(currentNode) + currentNode = childNode + currentIndentLevel = indentLevel + } + else { + repeat(currentIndentLevel - indentLevel) { currentNode = nodesStack.pop() } + currentIndentLevel = indentLevel + val sibling = QNDTreeNode(nodeName, currentNode.parent) + currentNode.parent!!.children.add(sibling) + currentNode = sibling + } + } + } + + + // test traverse resulting tree + fun preorder(node: QNDTreeNode, depth: Int = 1) { + //if (node == null) return + + repeat(depth) { print("-") } + println("${node.data} -> ${node.parent}") + + node.children.forEach { preorder(it, depth + 1) } + } + + preorder(root) + + return root + } + + private fun String.countSpaces(): Int { + var c = 0 + while (c <= this.length) { + if (this[c] == ' ') + c++ + else + break + } + + return c + } +} + +class QNDTreeNode(var data: T? = null, var parent: QNDTreeNode? = null) { + var children = ArrayList>() +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/swingapp/IMStringReader.kt b/src/net/torvald/terrarum/swingapp/IMStringReader.kt index be021dc17..5648649ac 100644 --- a/src/net/torvald/terrarum/swingapp/IMStringReader.kt +++ b/src/net/torvald/terrarum/swingapp/IMStringReader.kt @@ -24,6 +24,7 @@ import javax.swing.* * * Created by minjaesong on 2017-02-05. */ +@Deprecated("Use Gdx.input.GetTextInput") class IMStringReader(feedInput: (String) -> Unit, message: String? = null) : JFrame() { private val inputArea = JTextField() diff --git a/src/net/torvald/terrarum/ui/UIItemTextButton.kt b/src/net/torvald/terrarum/ui/UIItemTextButton.kt index 4e744e0b5..f7668ffe3 100644 --- a/src/net/torvald/terrarum/ui/UIItemTextButton.kt +++ b/src/net/torvald/terrarum/ui/UIItemTextButton.kt @@ -14,6 +14,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch */ open class UIItemTextButton( parentUI: UICanvas, + /** Stored text (independent to the Langpack) */ val labelText: String, override var posX: Int, override var posY: Int, @@ -37,6 +38,7 @@ open class UIItemTextButton( val defaultHighlightCol: Color = Color(0x00f8ff_ff) } + /** Actually displayed text (changes with the app language) */ val label: String get() = if (readFromLang) Lang[labelText] else labelText diff --git a/work_files/GameDesign/ENVIRON.md b/work_files/GameDesign/ENVIRON.md index 359736620..6d1fc09c0 100644 --- a/work_files/GameDesign/ENVIRON.md +++ b/work_files/GameDesign/ENVIRON.md @@ -25,6 +25,36 @@ When the atmos is dusty, "colours" of sunrise/sunsets are more apparent: when in Colour of the mie scattering DOES follow the colourimeter observation (orange -> red -> wine bordeaux -> (very short term of) grey -> blueish grey) +Overcast/Rainy sky has following colour temperature (measured three times): + +``` + Result is XYZ: 809.379324 850.192752 1033.330908, D50 Lab: 220.753889 -4.325124 -56.292269 + CCT = 7388K (Delta E 3.094551) + Closest Planckian temperature = 7185K (Delta E 2.752967) + Closest Daylight temperature = 7428K (Delta E 0.462706) + Color Rendering Index (Ra) = 99.1 [ R9 = 92.0 ] + R1 = 99.3 R2 = 99.9 R3 = 99.4 R4 = 99.2 R5 = 99.4 R6 = 99.9 R7 = 98.8 + R8 = 97.2 R9 = 92.0 R10 = 99.7 R11 = 99.4 R12 = 99.1 R13 = 99.7 R14 = 99.6 + Television Lighting Consistency Index 2012 (Qa) = 99.9 + + Result is XYZ: 799.049876 839.524181 1015.426500, D50 Lab: 219.759423 -4.379982 -55.308508 + CCT = 7344K (Delta E 3.137397) + Closest Planckian temperature = 7142K (Delta E 2.790319) + Closest Daylight temperature = 7381K (Delta E 0.430938) + Color Rendering Index (Ra) = 99.2 [ R9 = 92.1 ] + R1 = 99.4 R2 = 99.9 R3 = 99.4 R4 = 99.2 R5 = 99.4 R6 = 99.9 R7 = 98.8 + R8 = 97.3 R9 = 92.1 R10 = 99.7 R11 = 99.4 R12 = 99.2 R13 = 99.7 R14 = 99.6 + Television Lighting Consistency Index 2012 (Qa) = 99.9 + + Result is XYZ: 787.300466 827.265267 1011.192183, D50 Lab: 218.606255 -4.393304 -56.653947 + CCT = 7448K (Delta E 3.152185) + Closest Planckian temperature = 7236K (Delta E 2.805598) + Closest Daylight temperature = 7483K (Delta E 0.402978) + Color Rendering Index (Ra) = 99.2 [ R9 = 92.5 ] + R1 = 99.4 R2 = 99.9 R3 = 99.3 R4 = 99.2 R5 = 99.5 R6 = 99.8 R7 = 98.8 + R8 = 97.4 R9 = 92.5 R10 = 99.7 R11 = 99.5 R12 = 99.3 R13 = 99.8 R14 = 99.5 + Television Lighting Consistency Index 2012 (Qa) = 99.9 +``` ## Weather effects ## diff --git a/work_files/TerrarumStructure.pptx b/work_files/TerrarumStructure.pptx index fe936c8f8..ecb4f48ae 100644 Binary files a/work_files/TerrarumStructure.pptx and b/work_files/TerrarumStructure.pptx differ diff --git a/work_files/graphics/fonts/LatinExtA_variable.psd b/work_files/graphics/fonts/LatinExtA_variable.psd index 3fadeacb0..fb2b34153 100644 --- a/work_files/graphics/fonts/LatinExtA_variable.psd +++ b/work_files/graphics/fonts/LatinExtA_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ed13d2ff05536c10bd44524ed06f83b0675fb30b331694f42c419dbeb317063 -size 174001 +oid sha256:201564159e83b40bbbb7453e4b6c82a959cb3f3ade7244a0e3c309daeadfebe7 +size 173642 diff --git a/work_files/graphics/fonts/furigana.psd b/work_files/graphics/fonts/furigana.psd index e666ea3e6..87fdb57f2 100644 --- a/work_files/graphics/fonts/furigana.psd +++ b/work_files/graphics/fonts/furigana.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e0c52cfe75417379fa2720dde9919a4672bfa9279b6d9a1007525a1517edc2d -size 29874 +oid sha256:4baeadad67763895d8a912bb7fbe277c6c932998fb4aa7ad86d78b2a5d7ae522 +size 38012 diff --git a/work_files/graphics/fonts/hangul_johab.psd b/work_files/graphics/fonts/hangul_johab.psd index b2c7ce0ff..ca6698a6c 100644 --- a/work_files/graphics/fonts/hangul_johab.psd +++ b/work_files/graphics/fonts/hangul_johab.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e20ead492bf87f67a2159bbfc40426cd3ea44fca1b35237901fd90a17a47acf -size 146448 +oid sha256:896a1aadd3ef618e59b9f4a0dd5fcaffce770d01de2020f538b3cf004fb0082f +size 615617 diff --git a/work_files/graphics/fonts/hangul_u1100.psd b/work_files/graphics/fonts/hangul_u1100.psd deleted file mode 100644 index dce9e47d9..000000000 --- a/work_files/graphics/fonts/hangul_u1100.psd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3297bc8fe784984ea3c185a10bc783ecc5db9c60aa56eabf19489a51c5cc3c28 -size 300968 diff --git a/work_files/graphics/fonts/ipa_ext_variable.psd b/work_files/graphics/fonts/ipa_ext_variable.psd index 79a5c292a..d004c7fd8 100644 --- a/work_files/graphics/fonts/ipa_ext_variable.psd +++ b/work_files/graphics/fonts/ipa_ext_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b38fca7d91c91390d9bbb193492a7a140c465cb9e955f9da132e1898c4099dd -size 247419 +oid sha256:3463b84aada774fb810a228ce81f8b883fcccae6242b610a584d1cb40147688d +size 247913 diff --git a/work_files/graphics/fonts/myanmar_variable.psd b/work_files/graphics/fonts/myanmar_variable.psd new file mode 100644 index 000000000..dce86eb66 --- /dev/null +++ b/work_files/graphics/fonts/myanmar_variable.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62f978fb3b7787ab1be51d786a28f066b67c64aa6b39c14f521b3bcd101f9984 +size 335848 diff --git a/work_files/graphics/fonts/tamil_variable.psd b/work_files/graphics/fonts/tamil_variable.psd new file mode 100644 index 000000000..52b18f0d5 --- /dev/null +++ b/work_files/graphics/fonts/tamil_variable.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:623cac267343282201848e76f6854f4999c82ac27575c79bbfc6f926d7cf9574 +size 159298 diff --git a/work_files/graphics/fonts/unipunct_variable.psd b/work_files/graphics/fonts/unipunct_variable.psd index b7b1f800c..fbf9ff47b 100644 --- a/work_files/graphics/fonts/unipunct_variable.psd +++ b/work_files/graphics/fonts/unipunct_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e95a4878b55d3863aafbaed32afeea9cb9290b48d9cb0f45b1693d5d6059fae -size 213802 +oid sha256:6f5966a5290baa94589d2cf1c6bc16a296f7e3f017b5f1e9b21c802ee9752f13 +size 213764