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

a point to insert the item image to the item sprite

Browse Source
This commit is contained in:
minjaesong
2022-01-06 14:56:36 +09:00
parent b1856852e4
commit 0d14f9e027
11 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/terrarum/serialise/WriteActor.kt
View File

@@ -3,8 +3,10 @@ package net.torvald.terrarum.serialise
import net.torvald.spriteanimation.HasAssembledSprite
import net.torvald.spriteanimation.SpriteAnimation
import net.torvald.spriteassembler.ADProperties
import net.torvald.terrarum.ItemCodex
import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
import net.torvald.terrarum.savegame.*
@@ -140,16 +142,18 @@ object ReadActor {
actor.animDescGlow = ADProperties(ByteArray64Reader(animFileGlow.bytes, Common.CHARSET))
}
val heldItem = ItemCodex[actor.inventory.itemEquipped[GameItem.EquipPosition.HAND_GRIP]]
if (bodypartsFile != null)
actor.reassembleSprite(disk, actor.sprite!!, actor.spriteGlow)
actor.reassembleSpriteFromDisk(disk, actor.sprite!!, actor.spriteGlow, heldItem)
else
actor.reassembleSprite(actor.sprite!!, actor.spriteGlow)
actor.reassembleSprite(actor.sprite!!, actor.spriteGlow, heldItem)
}
else if (actor is ActorWithBody && actor is HasAssembledSprite) {
if (actor.animDesc != null) actor.sprite = SpriteAnimation(actor)
if (actor.animDescGlow != null) actor.spriteGlow = SpriteAnimation(actor)
actor.reassembleSprite(actor.sprite, actor.spriteGlow)
actor.reassembleSprite(actor.sprite, actor.spriteGlow, null)
}

4
src/net/torvald/terrarum/serialise/WriteSavegame.kt
View File

@@ -163,8 +163,8 @@ object LoadSavegame {
newIngame.worldSavefileName = getWorldSavefileName(newIngame.savegameNickname, world)
newIngame.playerSavefileName = getPlayerSavefileName(player)
worldDisk.dispose()
playerDisk.dispose()
// worldDisk.dispose()
// playerDisk.dispose()
val loadJob = { it: LoadScreenBase ->
val loadscreen = it as ChunkLoadingLoadScreen