diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt index 181cb744f..6a7491857 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt @@ -77,9 +77,9 @@ object PlayerBuilderSigrid { fun fillTestInventory(inventory: ActorInventory) { App.tileMaker.tags.forEach { t, _ -> - inventory.add(t, 5) + inventory.add(t, 9995) try { - inventory.add("wall@"+t, 9995) // this code will try to add nonexisting wall items, do not get surprised with NPEs + inventory.add("wall@$t", 9995) // this code will try to add nonexisting wall items, do not get surprised with NPEs } catch (e: Throwable) { System.err.println("[PlayerBuilder] $e") diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt index fc0df55f4..952a258e9 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt @@ -1,15 +1,14 @@ package net.torvald.terrarum.modulebasegame.ui +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 com.badlogic.gdx.Input import net.torvald.terrarum.* import net.torvald.terrarum.UIItemInventoryCatBar.Companion.CAT_ALL import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameitem.GameItem import net.torvald.terrarum.gameworld.fmod -import net.torvald.terrarum.itemproperties.ItemCodex import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.gameactors.ActorInventory import net.torvald.terrarum.modulebasegame.gameactors.FixtureInventory @@ -22,7 +21,6 @@ import net.torvald.terrarum.ui.UIItem import net.torvald.terrarum.ui.UIItemImageButton import net.torvald.terrarum.ui.UIItemTextButton.Companion.defaultActiveCol import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack -import java.util.* import kotlin.math.floor /** @@ -524,7 +522,7 @@ class UIItemInventoryItemGrid( // scroll the item list (for now) if (mouseUp) { - scrollItemPage(amountX.toInt()) + scrollItemPage(amountY.toInt()) } return true diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt index f502efe3c..a97ba496f 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt @@ -4,13 +4,13 @@ import com.badlogic.gdx.graphics.Camera import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.SpriteBatch import net.torvald.terrarum.App +import net.torvald.terrarum.ItemCodex import net.torvald.terrarum.Second import net.torvald.terrarum.Terrarum import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameworld.fmod import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.ui.UICanvas -import net.torvald.terrarum.* /** * A bar-shaped representation of the Quickslot. @@ -86,7 +86,7 @@ class UIQuickslotBar : UICanvas() { override fun scrolled(amountX: Float, amountY: Float): Boolean { // super.scrolled(amount) // no UIItems here - selection = selection.plus(if (amountX > 1) 1 else if (amountX < -1) -1 else 0).fmod(SLOT_COUNT) + selection = selection.plus(if (amountY > 1) 1 else if (amountY < -1) -1 else 0).fmod(SLOT_COUNT) return true } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt index c8b29e5eb..5c248656c 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt @@ -15,10 +15,10 @@ open class UITitleWallOfText(private val text: List) : UICanvas() { private val textAreaHMargin = 48 - override var width = App.scr.width - UIRemoCon.remoConWidth - textAreaHMargin + override var width = 600 override var height = App.scr.height - textAreaHMargin * 2 private val textArea = UIItemTextArea(this, - UIRemoCon.remoConWidth, textAreaHMargin, + (App.scr.width - width) / 2, textAreaHMargin, width, height )