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

Player movement seems like back to working, res→assets

Browse Source 
Former-commit-id: f91181caee4dabf4cb2e51d8077441c6b0f83757
Former-commit-id: 8b450303698c5c85dea9145a056b290b95a6a7b0
This commit is contained in:
Song Minjae
2016-08-02 17:32:42 +09:00
parent 5e7a95a3b9
commit 17c39c1824
248 changed files with 371 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt
View File

@@ -20,11 +20,11 @@ object ItemSlotImageBuilder {
private val colourWhite = Color(0xC0C0C0)
private val numberFont = SpriteSheetFont(
SpriteSheet("./res/graphics/fonts/numeric_small.png", 5, 8),
SpriteSheet("./assets/graphics/fonts/numeric_small.png", 5, 8),
'0'
)
val slotImage = Image("./res/graphics/gui/quickbar/item_slot.png") // must have same w/h as slotLarge
val slotLarge = Image("./res/graphics/gui/quickbar/item_slot_large.png")
val slotImage = Image("./assets/graphics/gui/quickbar/item_slot.png") // must have same w/h as slotLarge
val slotLarge = Image("./assets/graphics/gui/quickbar/item_slot_large.png")
private val canvas = Image(slotImage.width, slotImage.height)
private val canvasLarge = Image(slotLarge.width, slotLarge.height)

12
src/net/torvald/terrarum/ui/MessageWindow.kt
View File

@@ -31,14 +31,14 @@ constructor(override var width: Int, isBlackVariant: Boolean) : UICanvas {
init {
if (!isBlackVariant) {
segmentLeft = Image("./res/graphics/gui/message_twoline_white_left.png");
segmentRight = Image("./res/graphics/gui/message_twoline_white_right.png");
segmentBody = Image("./res/graphics/gui/message_twoline_white_body.png");
segmentLeft = Image("./assets/graphics/gui/message_twoline_white_left.png");
segmentRight = Image("./assets/graphics/gui/message_twoline_white_right.png");
segmentBody = Image("./assets/graphics/gui/message_twoline_white_body.png");
}
else {
segmentLeft = Image("./res/graphics/gui/message_twoline_black_left.png")
segmentRight = Image("./res/graphics/gui/message_twoline_black_right.png")
segmentBody = Image("./res/graphics/gui/message_twoline_black_body.png")
segmentLeft = Image("./assets/graphics/gui/message_twoline_black_left.png")
segmentRight = Image("./assets/graphics/gui/message_twoline_black_right.png")
segmentBody = Image("./assets/graphics/gui/message_twoline_black_body.png")
}
uiFont = GameFontWhite()
height = segmentLeft!!.height