width fixes in UI

src/net/torvald/terrarum/gamecontroller/IngameController.kt

@@ -7,6 +7,7 @@ import net.torvald.terrarum.AppLoader
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.floorInt
 import net.torvald.terrarum.gameactors.AVKey
+import net.torvald.terrarum.gameworld.fmod
 import net.torvald.terrarum.itemproperties.GameItem
 import net.torvald.terrarum.modulebasegame.Ingame
 import net.torvald.terrarum.worlddrawer.FeaturesDrawer
@@ -150,7 +151,7 @@ class IngameController(val ingame: Ingame) : InputAdapter() {
             if (ingame.actorNowPlaying != null) {
                 ingame.actorNowPlaying!!.actorValue.set(
                         AVKey.__PLAYER_QUICKSLOTSEL,
-                        (ingame.actorNowPlaying!!.actorValue.getAsInt(AVKey.__PLAYER_QUICKSLOTSEL)!! - amount) % ingame.actorNowPlaying!!.inventory.quickSlot.size
+                        (ingame.actorNowPlaying!!.actorValue.getAsInt(AVKey.__PLAYER_QUICKSLOTSEL)!! - amount) fmod ingame.actorNowPlaying!!.inventory.quickSlot.size
                 )
             }
         }

src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt

@@ -209,7 +209,7 @@ class UIItemInventoryDynamicList(
 
             batch.color = colour
             batch.draw(
-                    (parentUI as UIInventoryFull).catIcons.get(20,0),
+                    (parentUI as UIInventoryFull).catIcons.get(if (i == itemPage) 20 else 21,0),
                     scrollUpButton.posX.toFloat(),
                     getScrollDotYHeight(i).toFloat()
             )

src/net/torvald/terrarum/modulebasegame/ui/UITitleCharactersList.kt

@@ -6,7 +6,6 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import net.torvald.terrarum.Second
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.blendNormal
-import net.torvald.terrarum.serialise.SavegameLedger
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.ui.UIItemList
 
@@ -17,13 +16,10 @@ class UITitleCharactersList : UICanvas() {
 
     override var openCloseTime: Second = 0f
 
-
-
     private val moduleAreaHMargin = 48
-
     private val moduleAreaBorder = 8
 
-    override var width = (Terrarum.WIDTH * 0.75).toInt() - moduleAreaHMargin
+    override var width = Terrarum.WIDTH - UIRemoCon.remoConWidth - moduleAreaHMargin
     override var height = Terrarum.HEIGHT - moduleAreaHMargin * 2
 
     private val moduleInfoCells = ArrayList<UIItemSavegameInfoCell>()
@@ -37,7 +33,7 @@ class UITitleCharactersList : UICanvas() {
     private val mouduleArea = UIItemList<UIItemSavegameInfoCell>(
             this,
             moduleInfoCells,
-            (Terrarum.WIDTH * 0.25f).toInt(), moduleAreaHMargin,
+            UIRemoCon.remoConWidth, moduleAreaHMargin,
             width,
             height,
             inactiveCol = Color.WHITE,

src/net/torvald/terrarum/modulebasegame/ui/UITitleModules.kt

@@ -4,12 +4,11 @@ import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import net.torvald.terrarum.ModMgr
+import net.torvald.terrarum.Second
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.blendNormal
-import net.torvald.terrarum.Second
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.ui.UIItemList
-import net.torvald.terrarum.ui.UIItemTextButtonList
 
 /**
  * Created by minjaesong on 2017-08-01.
@@ -18,13 +17,10 @@ class UITitleModules : UICanvas() {
 
     override var openCloseTime: Second = 0f
 
-
-
     private val moduleAreaHMargin = 48
-
     private val moduleAreaBorder = 8
 
-    override var width = (Terrarum.WIDTH * 0.75).toInt() - moduleAreaHMargin
+    override var width = Terrarum.WIDTH - UIRemoCon.remoConWidth - moduleAreaHMargin
     override var height = Terrarum.HEIGHT - moduleAreaHMargin * 2
 
 
@@ -44,7 +40,7 @@ class UITitleModules : UICanvas() {
     private val mouduleArea = UIItemList<UIItemModuleInfoCell>(
             this,
             moduleInfoCells,
-            (Terrarum.WIDTH * 0.25f).toInt(), moduleAreaHMargin,
+            UIRemoCon.remoConWidth, moduleAreaHMargin,
             width,
             height,
             inactiveCol = Color.WHITE,

src/net/torvald/terrarum/modulebasegame/ui/UITitleWallOfText.kt

@@ -3,13 +3,11 @@ package net.torvald.terrarum.modulebasegame.ui
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.terrarum.AppLoader
 import net.torvald.terrarum.CreditSingleton
-import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.Second
+import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.ui.UIItemTextArea
-import net.torvald.terrarum.ui.UIItemTextButtonList
 
 open class UITitleWallOfText(private val text: List<String>) : UICanvas() {
 
@@ -17,10 +15,10 @@ open class UITitleWallOfText(private val text: List<String>) : UICanvas() {
 
 
     private val textAreaHMargin = 48
-    override var width = (Terrarum.WIDTH * 0.75).toInt()
+    override var width = Terrarum.WIDTH - UIRemoCon.remoConWidth - textAreaHMargin
     override var height = Terrarum.HEIGHT - textAreaHMargin * 2
     private val textArea = UIItemTextArea(this,
-            Terrarum.WIDTH - width, textAreaHMargin,
+            UIRemoCon.remoConWidth, textAreaHMargin,
             width, height
     )