curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fixed a NaN bug caused by a zero-width/height hitbox

Browse Source 
Also inventory is widened to 10x7 of prev 9x7
This commit is contained in:
minjaesong
2018-11-06 04:02:33 +09:00
parent cb78f3dbab
commit 9b087f0ae5
14 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
View File

@@ -31,7 +31,7 @@ class UIInventoryFull(
override var width: Int = Terrarum.WIDTH
override var height: Int = Terrarum.HEIGHT
val internalWidth: Int = 630
val internalWidth: Int = 686
val internalHeight: Int = 558 // grad_begin..grad_end..contents..grad_begin..grad_end

14
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt
View File

@@ -23,8 +23,8 @@ import java.util.ArrayList
*
* Note: everything is pretty much fixed size.
*
* Dimension of the whole area: 496x384
* Number of grids: 9x7
* Dimension of the whole area: 552x384
* Number of grids: 10x7
* Number of lists: 2x7
*
* Created by minjaesong on 2017-10-21.
@@ -79,9 +79,9 @@ class UIItemInventoryDynamicList(
7 * 2, {
UIItemInventoryElem(
parentUI = inventoryUI,
posX = this.posX + (244 + listGap) * (it % 2),
posX = this.posX + (272 + listGap) * (it % 2),
posY = this.posY + (UIItemInventoryElem.height + listGap) * (it / 2),
width = 244,
width = 272,
item = null,
amount = UIItemInventoryElem.UNIQUE_ITEM_HAS_NO_AMOUNT,
itemImage = null,
@@ -93,11 +93,11 @@ class UIItemInventoryDynamicList(
inactiveTextCol = defaultTextColour
) })
private val itemGrid = Array<UIItemInventoryCellBase>(
7 * 9, {
7 * 10, {
UIItemInventoryElemSimple(
parentUI = inventoryUI,
posX = this.posX + (UIItemInventoryElemSimple.height + listGap) * (it % 9),
posY = this.posY + (UIItemInventoryElemSimple.height + listGap) * (it / 9),
posX = this.posX + (UIItemInventoryElemSimple.height + listGap) * (it % 10),
posY = this.posY + (UIItemInventoryElemSimple.height + listGap) * (it / 10),
item = null,
amount = UIItemInventoryElem.UNIQUE_ITEM_HAS_NO_AMOUNT,
itemImage = null,

2
src/net/torvald/terrarum/modulebasegame/ui/UIRemoCon.kt
View File

@@ -320,7 +320,7 @@ open class UIRemoCon(treeRepresentation: QNDTreeNode<String>) : UICanvas() {
}
companion object {
val remoConWidth = 280
val remoConWidth = 304
fun getRemoConHeight(menu: ArrayList<String>) = 36 * menu.size.plus(1)
fun getRemoConHeight(menu: Array<String>) = 36 * menu.size.plus(1)
val menubarOffY: Int; get() = Terrarum.HEIGHT / 2 - (Terrarum.fontGame.lineHeight * 1.5).toInt()