mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-21 20:18:14 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed item groups from D2S

Browse Source
This commit is contained in:
Collin Smith 2019-04-01 20:49:48 -07:00
parent d05a3c6f3e
commit 8b590d109c
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/riiablo/codec/D2S.java
View File

@ -9,10 +9,8 @@ import com.badlogic.gdx.utils.GdxRuntimeException;
import com.riiablo.Riiablo;
import com.riiablo.codec.util.BitStream;
import com.riiablo.entity.Player;
import com.riiablo.item.BodyLoc;
import com.riiablo.item.Item;
import com.riiablo.item.Location;
import com.riiablo.item.StoreLoc;
import com.riiablo.util.BufferUtils;
import com.riiablo.util.DebugUtils;
@ -23,7 +21,6 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Arrays;
import java.util.Date;
import java.util.EnumMap;
public class D2S {
private static final String TAG = "D2S";
@ -674,8 +671,6 @@ public class D2S {
public byte header[];
public short size;
public Array<Item> items;
public EnumMap<BodyLoc, Item> equipped;
public Array<Item> inventory;
static ItemData obtain(ByteBuffer buffer, byte[] SECTION_FOOTER, boolean consumeFooter) {
return new ItemData().read(buffer, SECTION_FOOTER, consumeFooter);
@ -686,8 +681,6 @@ public class D2S {
size = buffer.getShort();
items = new Array<>(size);
equipped = new EnumMap<>(BodyLoc.class);
inventory = new Array<>();
for (int i = 0; i < size; i++) {
ByteBuffer slice = BufferUtils.slice(buffer, SECTION_HEADER, true, SECTION_FOOTER, false);
if (slice.remaining() <= 0) break;
@ -697,11 +690,6 @@ public class D2S {
bitStream.skip(SECTION_HEADER.length * Byte.SIZE);
Item item = Item.loadFromStream(bitStream);
items.add(item);
if (item.location == Location.EQUIPPED && item.bodyLoc != BodyLoc.NONE) {
equipped.put(item.bodyLoc, item);
} else if (item.location == Location.STORED && item.storeLoc == StoreLoc.INVENTORY) {
inventory.add(item);
}
for (int j = 0; j < item.socketsFilled; j++) {
slice = BufferUtils.slice(buffer, SECTION_HEADER, true, SECTION_FOOTER, false);

8
core/src/com/riiablo/panel/HirelingPanel.java
View File

@ -31,6 +31,8 @@ import com.riiablo.widget.Label;
import org.apache.commons.lang3.ArrayUtils;
import java.util.EnumMap;
public class HirelingPanel extends WidgetGroup implements Disposable {
private static final String TAG = "HirelingPanel";
@ -136,10 +138,14 @@ public class HirelingPanel extends WidgetGroup implements Disposable {
head.yOffs = 1;
addActor(head);
EnumMap<BodyLoc, Item> equipped = new EnumMap<>(BodyLoc.class);
for (Item item : gameScreen.player.merc.items.items.items) {
equipped.put(item.bodyLoc, item);
}
for (int i = BodyLocs.HEAD; i < BodyLocs.NUM_LOCS; i++) {
if (bodyParts[i] == null) continue;
bodyParts[i].slot = i;
bodyParts[i].item = gameScreen.player.merc.items.items.equipped.get(BodyLoc.valueOf(i));
bodyParts[i].item = equipped.get(BodyLoc.valueOf(i));
bodyParts[i].setBodyPart(Riiablo.files.bodylocs.get(i).Code);
}