From 9d2b5e14945afedb3a45456985dbdbfd30ad4df2 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Mon, 11 Mar 2019 01:54:21 -0700 Subject: [PATCH] Added transforms to dropped items so color matches --- core/src/com/riiablo/codec/Animation.java | 6 ++++++ core/src/com/riiablo/entity/ItemHolder.java | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/com/riiablo/codec/Animation.java b/core/src/com/riiablo/codec/Animation.java index 19a670f4..804e16fe 100644 --- a/core/src/com/riiablo/codec/Animation.java +++ b/core/src/com/riiablo/codec/Animation.java @@ -598,6 +598,12 @@ public class Animation extends BaseDrawable { return layer(new Layer(dc, blendMode)); } + public Builder layer(DC dc, int blendMode, byte packedTransform) { + Layer layer = new Layer(dc, blendMode); + layer.setTransform(packedTransform); + return layer(layer); + } + public Builder layer(Layer layer) { layers[size++] = layer; return this; diff --git a/core/src/com/riiablo/entity/ItemHolder.java b/core/src/com/riiablo/entity/ItemHolder.java index 4d598f9c..1438603c 100644 --- a/core/src/com/riiablo/entity/ItemHolder.java +++ b/core/src/com/riiablo/entity/ItemHolder.java @@ -5,6 +5,7 @@ import com.riiablo.Riiablo; import com.riiablo.codec.Animation; import com.riiablo.codec.DC; import com.riiablo.codec.DC6; +import com.riiablo.graphics.BlendMode; import com.riiablo.graphics.PaletteIndexedBatch; import com.riiablo.item.Item; import com.riiablo.map.DT1; @@ -39,8 +40,9 @@ public class ItemHolder extends Entity { Riiablo.assets.load(flippyDescriptor); Riiablo.assets.finishLoadingAsset(flippyDescriptor); flippy = Riiablo.assets.get(flippyDescriptor); + byte packedTransform = (byte) ((item.base.Transform << 5) | (item.charColorIndex & 0x1F)); animation = Animation.builder() - .layer(flippy) + .layer(flippy, BlendMode.ID, packedTransform) .build(); animation.setLooping(false); animation.updateBox();